diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index 0ba9f6a7fa374da534f8e508adf339dbfcd98918..07ddf410730b73c49e9ed5e1fdd1b30855548951 100644
--- a/po/bg/LC_MESSAGES/gajim.po
+++ b/po/bg/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\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"
@@ -23,9 +23,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber клиент"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -55,39 +54,8 @@ msgstr "(Няма)"
 msgid "Hidden"
 msgstr "Скрита"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Разговор"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Стая"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "акаунт: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "не е в списъка"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Превключване на %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -103,219 +71,373 @@ msgstr ""
 "\n"
 "Осветяването на неправилно изписаните думи няма да се използва"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "В момента няма връзка"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "не е в списъка"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Разговор"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP криптиране"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "Криптирането е включено"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Криптирането е изключено"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Току-що получихте ново съобщение от „%s“"
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Ако затворите този прозорец и нямате включена опция за запазване на "
+"историята, съобщението ще бъде загубено."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Всеки %s _минути"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Събитие"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "заглавие на съобщението за състояние"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "текст на съобщението за състояние"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP не може да бъде използван на този компютър"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "В момента сте свързани със сървъра"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Трябва да сте изключени, за да смените името на акаунта."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Невалидно име на акаунт"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Трябва да посочите някакво име на акаунта."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Името на акаунта не може да съдържа интервали."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Невалиден Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Невалиден формат"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Портът по избор трябва все пак да е номер на порт"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Няма такъв наличен акаунт"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Трябва да сте свързани, за да редактирате личните данни."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Неуспех при извличането на частните ключове"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Възникна проблем при извличането на частните ви OpenPGP ключове."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Парола"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Изберете вашия OpenPGP ключ"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Име"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Сървър"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Редактиране на %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Регистриране в %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Член"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "Со_бственик"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Администратор"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Изритване"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Роля:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Изритване на %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Какво искате да направите?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Какво искате да направите?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Какво искате да направите?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Администратор"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Какво искате да направите?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Изображение"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Нова стая"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Невалидно потребителско име"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Трябва да въведете парола за новия акаунт."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Акаунтът беше добавен успешно"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -323,23 +445,23 @@ msgstr ""
 "Може да настроите допълнителните опции, като натиснете бутона „Напреднали“ "
 "или по-късно от менюто „Редактиране“->„Акаунти“ в основния прозорец."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Новият акаунт беше създаден успешно"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Възникна грешка при създаването на акаунта"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Името на акаунта се използва"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Вече има регистриран акаунт с това име."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -347,48 +469,48 @@ msgstr ""
 "Текстът под този ред е последното, което е казано откакто за последен път "
 "сте обърнали внимание на тази стая"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Действия за „%s“"
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Липсва „%s“ в URL на речника и не е WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в URL за търсене"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "Преди %i дни"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -414,12 +536,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -474,8 +596,22 @@ msgstr "Контактът вече съществува в списъка."
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber клиент"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@doganov.org>\n"
@@ -484,39 +620,48 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Искане за записване за акаунт „%s“ от %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Влизане в стая с акаунт „%s“"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Невалидно потребителско име"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Започване на разговор с акаунт „%s“"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Започване на разговор"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -525,137 +670,155 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Ново съобщение"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Ново частно съобщение"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "От %s в стая %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "От %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "Е-поща"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Еднократно съобщение с акаунт „%s“"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написа:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Поканени сте в стаята „%(room_jid)s“ от „%(contact_jid)s“"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -702,11 +865,6 @@ msgstr "Този вид услуга не съдържа обекти за по
 msgid "Browsing %s"
 msgstr "Търсене на %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Търсене"
@@ -715,30 +873,30 @@ msgstr "_Търсене"
 msgid "This service does not contain any items to browse."
 msgstr "Тази услуга не съдържа обекти за показване."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Влизане"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканиране на %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Потребители"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Описание"
 
@@ -759,7 +917,7 @@ msgstr "Напредък"
 msgid "Filename: %s"
 msgstr "Име на файл: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
@@ -775,8 +933,8 @@ msgstr "Вие"
 msgid "Sender: %s"
 msgstr "Изпращач: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Получател: "
 
@@ -789,7 +947,7 @@ msgstr "Запазен в: %s"
 msgid "File transfer completed"
 msgstr "Файловият трансфер завърши"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Отваряне на папката"
 
@@ -813,50 +971,55 @@ msgstr "Избор на файл за изпращане..."
 msgid "Send"
 msgstr "Изпращане"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Неуспех при достъпа до този файл"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Този файл се използва от друг процес."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Този файл вече съществува"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Какво искате да направите?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s иска да ви изпрати файл:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Запазване на файла като..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Този файл вече съществува"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -864,37 +1027,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/сек)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Невалиден файл"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Не е възможно да бъдат изпращани празни файлове"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "П_родължаване"
 
@@ -1158,31 +1321,31 @@ msgstr ""
 "Не е указан аргумент „%s“.\n"
 "Напишете „%s help %s“ за повече информация"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Необходим е X сървър. Спиране на програмата..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim изисква PyGTK 2.6 или по-новаа версия"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim изисква PyGTK 2.6 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim изисква GTK 2.6 или по-нова версия"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim изисква GTK 2.6 или по-нова версия. Спиране на програмата..."
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Липсва поддръжка на libglade за GTK+ runtime"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1191,7 +1354,7 @@ msgstr ""
 "Премахнете текущата версия на GTK+ runtime и инсталирайте последната "
 "стабилна от %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1199,77 +1362,77 @@ msgstr ""
 "Уверете се, че версиите на GTK и PyGTK на системата ви имат поддръжка за "
 "libglade."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim изискваа PySQLite2"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) упълномощаване за „%s“ (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "грешка при изпращане"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Не може да бъде установен контакт с „%s“"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "Публикуването на визитката е успешно"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Личната информация беше публикувана успешно."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1278,35 +1441,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Историята на разговорите беше мигрирана успешно към базата от данни."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Мигриране на записите на разговорите..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Изчакайте, докато записите на разговорите се мигрират..."
 
@@ -1327,148 +1490,100 @@ msgstr "Не може да изтриете текущата тема"
 msgid "Please first choose another for your current theme."
 msgstr "Първо изберете друга като текуща тема."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Сигурни ли сте, че искате да напуснете стаите „%s“?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Ако затворите този прозорец, връзката със стаите ще бъде прекъсната."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Неуспех при изпращането на частно съобщение"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
+msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
-#: ../src/groupchat_window.py:160
-msgid "Do _not ask me again"
-msgstr "Да _не се задава този въпрос отново"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Стая"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Няма тема за тази стая"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s беше изритан: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s беше отлъчен: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s беше отлъчен от %(who)s: %(reason)s"
 
-#: ../src/groupchat_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вече сте познати като %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s вече е познат като %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s напусна"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s сега е %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Промяна на темата"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Въведете новата тема:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Промяна на псевдонима"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Въведете новия псевдоним, който искате да използвате:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Отметката вече е установена"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Стаята „%s“ вече присъства в отметките."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Отметката беше добавена успешно"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Може да организирате отметките чрез менюто „Действия“."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "В момента няма връзка"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Псевдонимът не е намерен: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "„%s“ изглежда не е валиден JID"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Няма такава команда: /%s (ако искате да изпратите това, сложете представка /"
 "say)"
 
-#: ../src/groupchat_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Команди: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1480,7 +1595,7 @@ msgstr ""
 "Псевдонимът може да се замества, но не и ако съдърж „@“. Ако контактът е в "
 "стаята, той също ще бъде изритан. Не се поддържат интервали в псевдонима."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1488,12 +1603,12 @@ msgstr ""
 "Употреба: /%s <псевдоним>, отваря прозорец за лично съобщение със съответния "
 "контакт."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Употреба: /%s, изчиства текстовия прозорец."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1502,12 +1617,12 @@ msgstr ""
 "Употреба: /%s [причина], затваря текущия прозорец или подпрозорец и показва "
 "причина, ако е указана."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Употреба: /%s, настройва прозореца на стаята на компактен изглед."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1516,7 +1631,7 @@ msgstr ""
 "Употреба: /%s <JID> [причина], кани JID в текущата стая, причината е по "
 "избор."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1525,7 +1640,7 @@ msgstr ""
 "Употреба: /%s <стая>@<сървър>[/псевдоним], предлага влизане в стая@сървър, "
 "използването на указания псевдоним е по избор."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1536,7 +1651,7 @@ msgstr ""
 "от стаята и евентуално показва причина. Не се поддържат интервали в "
 "псевдонима."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1545,7 +1660,7 @@ msgstr ""
 "Употреба: /%s <действие>, изпраща действие до текущата стая. Използва се "
 "трето лице (т.е. „/%s експлодира“)."
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1554,17 +1669,17 @@ msgstr ""
 "Употреба: /%s <псевдоним> [съобщение], отваря прозорец за лично съобщение и "
 "изпраща съобщение до участника, указан с псевдонима."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Употреба: /%s <псевдоним>, сменя псевдонима ви в текущата стая."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Употреба: /%s [тема], показва или актуализира темата на текущата стая."
 
-#: ../src/groupchat_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1572,23 +1687,70 @@ msgstr ""
 "Употреба: /%s <съобщение>, изпраща съобщение без да се имат предвид други "
 "команди."
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Няма помощна информация за /%s"
 
+#: ../src/groupchat_control.py:1022
+#, python-format
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr "Сигурни ли сте, че искате да напуснете стаята „%s“?"
+
+#: ../src/groupchat_control.py:1023
+msgid "If you close this window, you will be disconnected from this room."
+msgstr "Ако затворите този прозорец, връзката със стаята ще бъде прекъсната."
+
+#: ../src/groupchat_control.py:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Да _не се задава този въпрос отново"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Промяна на темата"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Въведете новата тема:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Промяна на псевдонима"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Въведете новия псевдоним, който искате да използвате:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Отметката вече е установена"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Стаята „%s“ вече присъства в отметките."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Отметката беше добавена успешно"
+
+#: ../src/groupchat_control.py:1101
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Може да организирате отметките чрез менюто „Действия“."
+
 #. ask for reason
-#: ../src/groupchat_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Изритване на %s"
@@ -1746,42 +1908,38 @@ msgid "Accounts"
 msgstr "Акаунти"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Включване/изключване на уведомяването при завършил файлов трансфер"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Действия за _напреднали"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Добавяне на нов контакт"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Добавяне на _контакт"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Напреднали"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Редактор на настройки за напреднали"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "След псевдонима:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "След времето:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1791,63 +1949,63 @@ msgstr ""
 "Само при писане\n"
 "Изключено"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Позволяване изпращането на информация за _ОС"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Позволение за виждане на състоянието ми"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Позволяване на прозорци/уведомления при _Отсъствам/Не съм на разположение/"
 "Зает/Невидим"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Познато и като стил „iChat“"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Питане за съобщение за състояние при преминаване в режим:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Запитване за състоянието на контакта"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Питане за:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Задаване на Open_PGP ключ"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Упълномощаване на контакта, така че да знае кога сте свързани"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Автоматично „_Отсъствам“ след:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Автоматично „Не съм на _разположение“ след:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Автоматично влизане"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1859,71 +2017,71 @@ msgstr ""
 "Винаги да се използват стандартните програми на KDE\n"
 "Персонални"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Автоматично упълномощаване на контакта"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Автоматично свързване при разпадане на връзката"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Преди псевдонима:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Преди времето:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Рожден ден:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Получер"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Потребителска заявка"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "С_вързване при стартиране"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Отменя файловия трансфер"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Отменя избрания файлов трансфер"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Отменя избрания файлов трансфер и изтрива непълния файл"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "_Промяна на парола"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Промяна на парола"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Смяна на псе_вдоним"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Промяна на _темата"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "У_ведомления при разговор:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1933,7 +2091,7 @@ msgstr ""
 "дразни. Използвайте я внимателно, тъй като блокира всички съобщения от всеки "
 "контакт, който не е в списъка."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1945,213 +2103,214 @@ msgstr ""
 "използва TLS криптиране по подразбиране и избирайки тази опция, изключвате "
 "TLS."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Избор на _ключ..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Град:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Из_чистване"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Натиснете, за да смените паролата на акаунта"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Натиснете за вмъкване на емотикона (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Натиснете, за да видите функционалностите (като MSN, ICQ транспорти) на "
 "Jabber сървърите"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Натиснете, за да видите стари разговори в тази стая"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Натиснете, за да видите стари разговори с този контакт"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Фирма:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Настройки на _стаята"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Свързване при натискане на бутона „Приключване“"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Свързване"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Данни за контакта"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Данни за контакта"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "История на разговорите"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Държава:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Стандартен _набор икони за състояние:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Изтриване на MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Изтриване на съобщението за деня"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Изтрива съобщението за деня"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Отказване"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Отказване на упълномощаване на контакт, така че да не знае кога сте свързани"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Отдел:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Показване на аватари на контактите в списъка"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Показване на съобщенията за състояние на контактите в списъка"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "Е-поща:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Редактиране на групи"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Редактиране на личните данни..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Редактиране на _групи"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Управление на емотикони"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Активиране"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Въведете я отново за потвърждение:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Въведете нова парола:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Събития"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Всеки 5 _минути"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Допълнителен адрес:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Фамилия:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Файлови трансфери"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Файлови трансфери"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Файлов мениджър:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Филтър:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Стил на шрифта:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Забрана за виждане на състоянието ми"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: гггг-мм-дд"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Често задавани въпроси (уеб страница)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Отиване"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Персонализиране на темите на Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2159,7 +2318,7 @@ msgstr ""
 "Gajim може да изпраща и получава мета-информация, свързана с разговора с "
 "даден контакт"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2167,13 +2326,13 @@ msgstr ""
 "Автоматично ще се показва новото съобщение в нов прозорец за разговор или "
 "подпрозорец в съществуващ прозорец"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2181,7 +2340,7 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "свързване на контакти"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2189,70 +2348,70 @@ msgstr ""
 "Ще се появява съобщение за уведомяване в долния десен ъгъл на екрана при "
 "изключване на контакти"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Само ще се променя иконата на контакта, който е изпратил съобщението"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Помощник за създаване на акаунт"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Общи"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Собствено:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Група:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Свързване по HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Помощ в Интернет (уеб страници)"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Скрива прозореца"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Страница в Интернет:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Хост: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Вече имам регистриран акаунт"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Искам да _регистрирам нов Jabber акаунт"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Бих искал(а) да ви добавя към списъка си."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Ако тази опция е избрана, Gajim ще има и икона в областта за уведомяване."
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr "Ако е избрано, Gajim ще изобразява аватари на контакти в списъка"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2260,15 +2419,15 @@ msgstr ""
 "Ако е избрано, съобщенията за състояние на контактите ще се показват под "
 "имената им в списъка."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Ако тази опция е избрана, ще влизате в тази стая при стартиране."
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ако тази опция е избрана, ще се запомни паролата за този акаунт."
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2276,7 +2435,7 @@ msgstr ""
 "Ако тази опция е избрана, ще се запомнят размерите и позициите на списъка и "
 "прозореца за разговор на екрана за следващото стартиране на програмата."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2284,7 +2443,7 @@ msgstr ""
 "Ако тази опция е избрана, усмивките в ASCII като „:)“ ще се изобразяват със "
 "съответните графични емотикони."
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2292,7 +2451,7 @@ msgstr ""
 "Ако тази опция е избрана, Gajim ще изпраща пакети за поддържане на връзката "
 "с цел избягване на разпадането ѝ."
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2300,7 +2459,7 @@ msgstr ""
 "Ако е избрано, паролата ще се запази в ~/.gajim/config с права за четене "
 "само за потребителя"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2310,7 +2469,7 @@ msgstr ""
 "състояние (т.е. контакт от MSN ще има еквивалентната за MSN икона за "
 "състоянията „На линия“, „Отсъствам“, „Зает“ и т.н.)."
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2318,7 +2477,7 @@ msgstr ""
 "Ако тази опция е избрана, при стартиране Gajim ще се свързва автоматично, "
 "използвайки този акаунт."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2327,7 +2486,7 @@ msgstr ""
 "Ако тази опция е избрана, всяка промяна на глобалното състояние (от списъка "
 "в долната част на главния прозорец) ще променя и състоянието на този акаунт."
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2335,167 +2494,180 @@ msgstr ""
 "Ако имате два или повече акаунта и тази опция е избрана, Gajim ще изобразява "
 "всички контакти като от един акаунт."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Входящо съобщение:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Информация/запитване"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Вашите личните данни, както са запазени на сървъра"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Получена покана"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Влизане в _стая"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Местонахождение"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Управление на акаунти"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Управление на отметките"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Управление на емотикони"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Настройки на сървъра-посредник"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Управление на..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Бащино:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "_Председател"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Още"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Име:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Псевдоним:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Няма"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Уведомяване за контакти при: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "На _всяко съобщение"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Изпращане на съобщението и затваряне на прозореца"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Отваряне..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP криптиране"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Или изберете настроено съобщение:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Изходящо съобщение:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Парола:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Лични данни"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Изпълнение на _звуци"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Длъжност:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Пощенски код:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Обръщение:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Изписване на времето:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2505,64 +2677,60 @@ msgstr ""
 "събитията от Jabber сървър, когато два или повече клиента са свързани с един "
 "и същ акаунт. Клиентът с най-голям приоритет ще получава събитията."
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Профил и аватар"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Сървър-посредник:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Изготвяне на заявки..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Скоро посетени:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Регистриране към"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Премахване на акаунт _само от Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Премахване на акаунт от Gajim и от с_ървъра"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Премахване на файловия трансфер от списъка."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Премахва завършилите, прекъснатите или провалени файлови трансфери от списъка"
 
-#: ../src/gtkgui.glade.h:229
-msgid "Removing selected file transfer"
-msgstr "Премахване на избрания файлов трансфер"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Отговор на това съобщение"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Възстановяване на стандартните цветове"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Ре_сурс: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2576,220 +2744,216 @@ msgstr ""
 "ресурси „Вкъщи“ и „На работа“ по едно и също време. Ресурсът с най-голям "
 "приоритет ще получава събитията. (вижте по-долу)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Роля:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Настройки на стаята"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Стая:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Запазване на _паролата (несигурно)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Запазване на _положението и размера на списъка с контакти и прозорците за "
 "разговор"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Запазване на история на _разговорите за всички контакти"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Запазване на паро_ла"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Търсене"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Изпращане"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Изпращане на файл"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Изпращане на _еднократно съобщение"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Изпращане на _файл"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "_Ново съобщение..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Изпращане на пакети за поддържане на връзката"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Изпращане на съобщение"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Изпращане на съобщението и затваряне на прозореца"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Изпраща съобщение на всички потребители, свързани със сървъра в момента"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Сървър:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Функционалности на сървърите"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Настройване на MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Избор на _аватар"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Настройване на аватар при свързване"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Настройване на съобщение за деня"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Показване на всички _чакащи събития"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Показване на изкл_ючените контакти"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Показване на спис_ъка"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Показване на _XML конзола"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Показване само в спис_ъка"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr "Показва списък с файловите трансфери между двата контакта"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Свързване"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "Изкл_ючване"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Подреждане на контактите по състояние"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Започване на _разговор"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Щат:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Състояние"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Съобщение за състояние:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Състояние:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Спиране на избрания файлов трансфер"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Искане за записване"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Записване:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Наставка:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизиране на състоянието на акаунта с общото състояние"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Цвят на текста"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Шрифт на текста"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Автоматично съобщение за състояние при „Отсъствам“"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Автоматично съобщение за състояние при „Не съм на разположение“"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Тема:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2797,79 +2961,75 @@ msgstr ""
 "Това действие премахва файлов трансфер от списъка. Ако трансферът е активен, "
 "първо се прекъсва и след това се премахва."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Титла:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "До:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Превключване на Open_PGP криптиране"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Напишете новото съобщение за състояние:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Подчертано"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Актуализиране на MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Актуализиране на съобщението за деня"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Използване на _SSL (извън употреба)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Използване на _емотикони"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Използване на _набор икони на транспортите"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Използване на един прозорец за разговор с _подпрозорци"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Използване на удостоверяване"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Използване на различен хост/порт"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Уведомяване чрез изскачащ прозорец при завършване на файловия трансфер"
 
-#: ../src/gtkgui.glade.h:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2881,15 +3041,15 @@ msgstr ""
 "събития за съобщения възникват само ако са съобщения от контакт, с който не "
 "говорите в момента."
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "При получаване на ново събитие"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Работа"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2897,346 +3057,346 @@ msgstr ""
 "Трябва да имате акаунт, за да се свържете с\n"
 "Jabber сървър."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Вашия JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Добавяне на контакт..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "Добавяне към _списъка..."
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Администратор"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Администратор"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "На_преднали"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Упълномощаване"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Фон:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Забраняване на достъпа"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "_Добавяне на тази стая към отметките"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "Интернет _браузър:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Отказ"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Компактен изглед (Alt+C)"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Ръководства"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "Копиране на _JID/Е-поща"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Копиране на адреса на връзката"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Отказване"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Откриване на услуги..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Филтър:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Стая"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Икона в областта за уведомяване"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Влизане в нова стая..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Изритване"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Запазване на разговорите"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "Запазване на промените на _състоянията на контактите"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Пощенска програма:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Член"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Смесване на акаунти"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Съобщение"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "Пром_яна"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Промяна на акаунт..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Име: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Никога"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Уведомяване"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомяване при завършване на файловия трансфер"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_Да"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Свързани потребители"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Отваряне на пощенската програма"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Отваряне на връзката в браузър"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "Со_бственик"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Парола:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "П_ауза"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Плейър:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Показване"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "По_рт:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Публикуване"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Изход"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Премахване"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Премахване от списъка"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Преименуване"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Отговор"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Извличане"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Търсене"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Изпращане"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "Изпра_щане и затваряне"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Изпращане на частно съобщение"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Изпращане на съобщение от сървъра"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Изпращане на еднократно съобщение"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "С_ървър:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Избор на изображение..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Започване на разговор"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Състояние"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Записване"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Записване"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Използване на сървър-посредник"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "И_ме на потребител:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Глас"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML конзола..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "списък с файлови трансфери"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "минути"
 
@@ -3246,17 +3406,17 @@ msgstr "минути"
 msgid "Error: cannot open %s for reading"
 msgstr "Грешка: %s не може да бъде отворен за четене"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Грешка при четене на файл:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 msgid "Error parsing file:"
 msgstr "Грешка при анализиране на файл:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3295,92 +3455,102 @@ msgstr "Сегашното състояние е: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Сегашното състояние е: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Превключване на %s"
+
+#: ../src/notify.py:145
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 msgstr "%(nickname)s в стая %(room_name)s ви изпрати ново съобщение."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s ви изпрати ново съобщение."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s иска да ви изпрати файл."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получихте %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s от %(name)s прекъсна."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Успешно изпратихте %(filename)s на %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Файловият трансфер на %(filename)s до %(name)s прекъсна."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Смесени акаунти"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Сървър"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Влизане в нова стая"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Управление на отметките..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "от акаунт „%s“"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3388,69 +3558,69 @@ msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти чрез "
 "този транспорт."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Пре_именуване"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "С_вързване"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "Изкл_ючване"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3458,28 +3628,28 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: ../src/roster_window.py:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Въведете парола за GPG ключ за акаунт „%s“"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3487,20 +3657,20 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3508,183 +3678,137 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Промяна на съобщението за състояние..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "от акаунт "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Скрива това меню"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 msgid "All contacts in this group are offline or have errors"
 msgstr "Всички контакти в тази група са изключени или има грешки"
 
 #: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d непрочетено съобщение"
 msgstr[1] "Gajim - %d непрочетени съобщения"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s не предлага OpenPGP ключ и не сте задавали такъв"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Току-що получихте ново съобщение от „%s“"
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Ако затворите този прозорец и нямате включена опция за запазване на "
-"историята, съобщението ще бъде загубено."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Ако затворите този подпрозорец и нямате включена опция за запазване на "
-"историята, съобщението ще бъде загубено."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Неуспех при изпращането на частно съобщение"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Криптирането е включено"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Криптирането е изключено"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Роля: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Връзка: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Размер: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Временно преустановен"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Прехвърляне"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Тази услуга все още не е отговорила с подробна информация"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3698,24 +3822,24 @@ msgstr "Избор на аватар"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Размерът на изображението „%s“ е твърде голям"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Максималният размер е 32 килобайта."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3723,7 +3847,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3731,13 +3855,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3745,23 +3869,23 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr "Трябва да сте свързани, за да изтеглите визитката"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Лични данни"
@@ -3770,25 +3894,26 @@ msgstr "Лични данни"
 msgid "creating logs database"
 msgstr "създаване на база от данни за разговорите"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s e файл, а би трябвало да е папка"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Спиране на програмата"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "създаване на папка %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s e папка, а би трябвало да е файл"
@@ -3810,40 +3935,40 @@ msgstr "На тази машина няма инсталиран D-Bus или л
 msgid "Session bus is not available"
 msgstr "Няма наличен session bus"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Използвайте DBus и Notification-Daemon за показване на уведомленията"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Време в минути, след което състоянието да се променя на „Отсъствам“."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Време в минути, след което състоянието да се променя на „Не съм на "
 "разположение“."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Ако е „True“, не се премахват */_. Така *абв* ще е в получер стил, но със "
 "символите * *."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Добавяне на * и [n] към заглавието на списъка?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3851,30 +3976,30 @@ msgstr ""
 "Колко реда от предишния разговор да за запомнят при повторното отваряне на "
 "подпрозорец/прозорец."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Колко минути да отделят последните редове от предишния разговор."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:136
 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:130
+#: ../src/common/config.py:138
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Колко реда да се запазват за Ctrl+горна стрелка."
 
 #. which version created the config
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Използване на компактен изглед при отваряне на прозорец"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr "Използване на компактен изглед при отваряне на прозорец със стая"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3883,19 +4008,23 @@ msgstr ""
 "Или определен адрес съдържащ %s, където %s е думата/фразата, или "
 "'WIKTIONARY', което означава използване на wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Ако тази опция е избрана, Gajim може да се контролира отдалечено чрез gajim-"
 "remote."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Питане преди затваряне на подпрозорец/прозорец на стая."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3903,23 +4032,23 @@ msgstr ""
 "Превъзмогва хоста при файлов трансфер в случай, че се ползва NAT/"
 "пренасочване на портове."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Соред стандарта на IEC KiB = 1024 байта, KB = 1000 байта."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Показване на подпрозорец при един разговор?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Показване на границата на подпрозореца при един разговор?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Показване на бутона за затваряне на подпрозореца?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3927,7 +4056,7 @@ msgstr ""
 "Списък с думи, отделени с точка и запетая, които ще се осветяват при "
 "разговор в стая."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3936,11 +4065,11 @@ msgstr ""
 "администратора на прозорци. Тази настройка е валидна само ако се използва "
 "иконата в областта за уведомяване."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Ако е „True“, Gajim регистрира xmpp:// при всяко стартиране."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3948,7 +4077,7 @@ msgstr ""
 "Ако е „True“, ще се изобразява икона във всеки подпрозорец, съдържащ "
 "непрочетени съобщения. В зависимост от темата иконата може да бъде анимирана."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3956,7 +4085,7 @@ msgstr ""
 "Ако е „True“, ще се показва съобщението за състояние, ако има такова, на "
 "всеки контакт под името му списъка."
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:179
 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."
@@ -3964,8 +4093,8 @@ msgstr ""
 "Ако е „True“, ще се изпраща запитване за аватар до всеки контакт, който е "
 "нямал такъв последния път или пък има остарял кеширан аватар."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3973,72 +4102,87 @@ msgstr ""
 "Ако е „False“, вече няма да виждате реда за състоянието при разговорите, "
 "когато контактът променя състоянието си."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, оставете съобщение."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Наслаждавам се на живота навън"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4046,7 +4190,7 @@ msgstr ""
 "Звукът, който да се възпроизвежда, когато в стаята се изпише дума от "
 "muc_higlighted_words или когато съобщение съдържа псевдонима ви."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4056,61 +4200,66 @@ msgstr ""
 "„True“)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "зелена"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "колониална"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "човешка"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "синя"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "опростена"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Неуспех при влизането в стаята"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Неуспех при влизането в стаята"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Необходима е парола за влизане в тази стая."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Отлъчени сте от тази стая."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Такава стая не съществува."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Създаването на стаята е ограничено."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Трябва да използвате регистрирания псевдоним."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Не сте в списъка с членове."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4118,42 +4267,42 @@ msgstr ""
 "Предпочитаният псевдоним се използва от друг участник.\n"
 "Изберете друг псевдоним по-долу: "
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "вече сме записани за %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "искане за отписване от %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "вече сме отписани от %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Връзката на акаунт „%s“ се разпадна"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4163,61 +4312,61 @@ msgstr ""
 "Използвайте инструменти за управление на списъка като http://jru."
 "jabberstudio.org, за да го премахнете."
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Свързан към сървър %s:%s с %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "невидим"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "изключен"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4226,16 +4375,16 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Информацията за регистрация на транспорта %s не пристигна навреме."
 
-#: ../src/common/connection.py:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Времето изтече"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Възникна грешка в протокола:"
 
@@ -4357,10 +4506,6 @@ msgstr "Не_видим"
 msgid "Invisible"
 msgstr "Невидим"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Не е в списъка"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Неизвестно"
@@ -4448,10 +4593,39 @@ msgstr "затвори прозореца или подпрозореца"
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
-#: ../src/common/optparser.py:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "синьозелена"
 
+#~ msgid "account: "
+#~ msgstr "акаунт: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Сигурни ли сте, че искате да напуснете стаите „%s“?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Ако затворите този прозорец, връзката със стаите ще бъде прекъсната."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Включване/изключване на уведомяването при завършил файлов трансфер"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Премахване на избрания файлов трансфер"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Спиране на избрания файлов трансфер"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Използване на един прозорец за разговор с _подпрозорци"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Ако затворите този подпрозорец и нямате включена опция за запазване на "
+#~ "историята, съобщението ще бъде загубено."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Последната група не може да бъде премахната"
 
@@ -4511,9 +4685,6 @@ msgstr "синьозелена"
 #~ msgid "Chat with"
 #~ msgstr "Разговор с"
 
-#~ msgid "E-Mail"
-#~ msgstr "Е-поща"
-
 #~ msgid "Send New Message"
 #~ msgstr "Ново съобщение"
 
diff --git a/po/cs/LC_MESSAGES/gajim.po b/po/cs/LC_MESSAGES/gajim.po
index 05b4a9d1f2678f226852cb3ce8795ddc8c05c38d..9fc67c9e069da3d6c0f28a4a9983edf19a714839 100644
--- a/po/cs/LC_MESSAGES/gajim.po
+++ b/po/cs/LC_MESSAGES/gajim.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-17 15:11+0100\n"
 "Last-Translator: Pihhan <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -36,9 +36,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klient"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -68,39 +67,8 @@ msgstr "(Žádný)"
 msgid "Hidden"
 msgstr "Skrýté"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Rozhovor"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Diskuze"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "účet: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "není v seznamu"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Přepnout na %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -116,220 +84,373 @@ msgstr ""
 "\n"
 "Vlastnost zvýrazňování překlepů nebude použita"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Spojení není dostupné"
+
+#: ../src/chat_control.py:302
+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."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "není v seznamu"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Rozhovor"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Šifrování"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Šifrování zapnuto"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Šifrování vypnuto"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, 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:1189
+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:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minut"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktivní"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Událost"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "titulek stavu"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "text stavu"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "VÅ¡echny soubory"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP není použitelné na tomto počítači"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Nejste přávě připojen(a) k serveru"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Ke změně jména účtu se musite odpojit."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Neplatné jméno účtu"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Jméno účtu nemůže být prázdné."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Jméno účtu nesmí obsahovat mezery."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Neplatné Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 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:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Neplatný záznam"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Vlastní port musí být číslo portu."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Takový účet není dostupný"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez připojení nemůžete upravovat osobní údaje."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Selhalo získání privátního klíče"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Heslo"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte Váš OpenPGP klíč"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Jméno"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Uprav %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovat k %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "Č_len"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Vlastník"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Správce"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "Vy_kopnout"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Postavení:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Zakazuji %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, 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:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, 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:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, 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:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Správce"
+
+#: ../src/config.py:1961
+#, 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:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nová místnost"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 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:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Musíte zadat heslo pro nový účet."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Účet byl úspěšně přidán"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -337,23 +458,23 @@ 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:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Váš účet byl úspěšně vytvořen"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Nastala chyba při vytváření účtu"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Jméno účtu se používá"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Již máte účet s tímto jménem."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -361,48 +482,48 @@ msgstr ""
 "Text pod touto čarou označuje to, co bylo řečeno po posledním čtení této "
 "diskuze"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Akce pro \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Vyhledat ve _slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL slovníku chybí \"%s\" a není to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "před %i dny"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
@@ -428,12 +549,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transporty"
 
@@ -487,181 +608,222 @@ msgstr "Tento kontakt už je obsažen ve Vašem seznamu."
 msgid "A GTK+ jabber client"
 msgstr "GTK+ Jabber client"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Petr Menšík <pihhan@seznam.cz>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Žádost o autorizaci pro účet %s od %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Vstoupit do diskuze z účtu %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Neplatné uživatelské jméno"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začít rozhovor z účtu %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Začít rozhovor"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 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:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, 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:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hesla zadaná v obou políčkách musí být identická."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nová zpráva"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nová soukromá zpráva"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Od %s v místnosti %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Příjemce %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Jednoduchá zpráva z účtu %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napsal(a):\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Byl(a) jsi pozván(a) do místnosti %(room_jid)s od %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
@@ -708,11 +870,6 @@ msgstr "Tento typ služby neobsahuje žádné položky, které je možné prohl
 msgid "Browsing %s"
 msgstr "Prohlížení %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Prohlížet"
@@ -721,31 +878,31 @@ msgstr "_Prohlížet"
 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:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Vstoupit"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Úpravy"
 
 # FIXME: tohle je blbe prelozene, najit v kontextu a vymyslet lepsi oznaceni
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skenuji %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Uživatelé"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Popis"
 
@@ -766,7 +923,7 @@ msgstr "Průběh"
 msgid "Filename: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Velikost: %s"
@@ -782,8 +939,8 @@ msgstr "Vy"
 msgid "Sender: %s"
 msgstr "Odesílatel: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Příjemce: "
 
@@ -796,7 +953,7 @@ msgstr "Uloženo do: %s"
 msgid "File transfer completed"
 msgstr "Přenos soubor dokončen"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Otevřít obsahující složku"
 
@@ -820,50 +977,55 @@ msgstr "Vyber soubor k odeslání..."
 msgid "Send"
 msgstr "Odeslat"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemůže otevřít tento soubor"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Tento soubor je používán jiným procesem."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Tento soubor už existuje"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Co by jste rád(a) dělal(a)?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Soubor: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s Vám chce poslat soubor:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Uložit jako..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Tento soubor už existuje"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -871,37 +1033,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Neplatný soubor"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Soubor: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Není možné posílat prázdné soubory"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Pokračovat"
 
@@ -1160,33 +1322,33 @@ msgstr ""
 "Parametry \"%s\" nebyl uveden. \n"
 "Napište \"%s help %s\" pro více informací"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim vyžaduje X server k běhu. Končím..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim vyžaduje PyGTK 2.6 nebo novější"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim potřebuje GTK 2.6 nebo novější"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime vyžaduje podporu libglade"
 
 # FIXME: runtime?
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1195,85 +1357,85 @@ msgstr ""
 "Prosím odinstalujte stávající GTK+ runtime a nainstalujte poslední stabilní "
 "verzi z %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, 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:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vyžaduje PySQLite2"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizace pro %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "chyba při odesílání"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
 # FIXME: hrozna veta
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Uvidíte jej nebo ji vždy jako odpojenou."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "publikování vizitky bylo úspěšné"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobní údaje byly úspěšně publikovány."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1283,35 +1445,35 @@ 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:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Historie byla úspěšně převedena do databáze."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 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:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Převádím historii..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Prosím vyčkejte až bude historie převedena..."
 
@@ -1332,147 +1494,99 @@ msgstr "Nemůžete smazat právě používané téma"
 msgid "Please first choose another for your current theme."
 msgstr "Vyberte prosím napřed jiné téma."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Jste si jistý(á), že chcete opustit místnosti \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Pokud zavřete toto okno, budete odpojen(a) z těchto místností."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Odesílání soukromé zprávy selhalo"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Jste si jistý(á), že chcete opustit místnost \"%s\"?"
-
-#: ../src/groupchat_window.py:156
-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."
+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_window.py:160
-msgid "Do _not ask me again"
-msgstr "Příště _nezobrazovat"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Diskuze"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Místnost nemá žádné téma"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s byli vyhozeni: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s byli zakázáni: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Jste nyní znám(a) jako %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s se přejmenoval na %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s odešel(a)"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je nyní %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Měním Téma"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Prosím zadejte nové téma:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Měním přezdívku"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Prosím zadejte novou přezdívku, kterou chcete používat:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Záložka je už nastavena"
-
-#: ../src/groupchat_window.py:590
-#, 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_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Záložka byla úspěšně přidána"
-
-#: ../src/groupchat_window.py:601
-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."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Spojení není dostupné"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-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/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Přezdívka nenalezena: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevypadá jako platné JID"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Příkazy: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1484,7 +1598,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1492,12 +1606,12 @@ msgstr ""
 "Použití: /%s <přezdívka>, otevře okno soukromého rozhovoru uvedenému "
 "nájemníkovi."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použití: /%s, smaže zprávy v okně."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1506,12 +1620,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_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1520,7 +1634,7 @@ msgstr ""
 "Použití: /%s <JID> [důvod], pozve JID do této místnosti, případně s uvedeným "
 "důvodem."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1529,7 +1643,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_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1539,7 +1653,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_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1548,7 +1662,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_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1557,40 +1671,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_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žádná další nápověda pro /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Příště _nezobrazovat"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Měním Téma"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Prosím zadejte nové téma:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Měním přezdívku"
+
+#: ../src/groupchat_control.py:1071
+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:1089
+msgid "Bookmark already set"
+msgstr "Záložka je už nastavena"
+
+#: ../src/groupchat_control.py:1090
+#, 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:1100
+msgid "Bookmark has been added successfully"
+msgstr "Záložka byla úspěšně přidána"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
@@ -1748,42 +1909,38 @@ msgid "Accounts"
 msgstr "Účty"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Zapnout/vypnout upozornění při dokončení přenosu souboru"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "_Další akce"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Přidat nový kontakt"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Přidat _kontakt"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Editor rozšířeného nastavení"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Po přezdívce:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Po čase:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1793,62 +1950,62 @@ msgstr ""
 "Pouze píšu zprávu\n"
 "Vypnuto"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Povolit odeslání informace o _OS"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Dovol mu/jí vidět můj stav"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Známý také jako iChat styl"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Ptej se na stav při:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Požádat o zobrazení je(jí)ho stavu"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Žádá:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Přiřadit Open_PGP klíč"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "_Automaticky pryč po:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automaticky _nedostupný po:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Automaticky vstoupit"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1860,72 +2017,72 @@ msgstr ""
 "Vždy použít výchozí aplikace z KDE\n"
 "Vlastní"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automaticky autorizovat kontakt"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Automaticky se znovu připojit při ztrátě spojení"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Před přezdívkou:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Před časem:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Den narození:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Tučné"
 
 # FIXME: query ma cesky ekvivalent?
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Sestavit vlastní query"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Připojit po startu Gajimu"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Zrušit přenos souboru"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Zruší vybraný přenos souboru"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Zruší vybraný přenos souboru a smaže nedokončený soubor"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "_Změnit heslo"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Změnit heslo"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Změ_nit přezdívku"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Změnit _předmět"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "_Upozornění o stavu rozhovoru:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1935,7 +2092,7 @@ msgstr ""
 "rozvahou, protože tato volba zakáže všechny zprávy od kontaktů, které ještě "
 "nemáte v Seznamu"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1946,212 +2103,213 @@ msgstr ""
 "starší servery SSL. Pozor- Gajim použije TLS šifrování standardně, pokud "
 "server ohlásí jeho podporu. Touto volbou bude TLS vypnuto"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Vyberte _klíč..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Obec:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Vymazat"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Klikněte pro změnu hesla k účtu"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikni pro vložení smajlíku (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klikněte pro seznam vlastností (jako MSN, ICQ transporty) jabber serverů"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Klikněte pro starší konverzaci v této místnosti"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Klikněte pro starší konverzaci s tímto kontaktem"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Společnost:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Nastavit _místnost"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Připojit když stisknu Dokončit"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Spojení"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Informace o kontaktu"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Informace o kontaktu"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Historie konverzace"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "ZemÄ›:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "_Výchozí ikony stavů:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Smazat MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Smazat Zprávu dne"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Smaže zprávu dne"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Odmítnout"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Oddělení:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Zobrazovat avatary kontaktů v Seznamu"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Zobrazovat popis stavu kontaktů v Seznamu"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Upravit skupiny"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Upravit osobní informace..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Upravit _skupiny"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Spravuj smajlíky"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Povolit"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Zadejte znovu pro ověření:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Zadejte heslo:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Události"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Každých 5 _minut"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Další adresa:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Rodina:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Přenosy souborů"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Přenosy souborů"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Správce souborů:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Staly písma:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Písmo:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Zakaž mu/jí vidět můj stav"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené dotazy - FAQ (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Jdi"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Úprava témat Gajimu"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2159,7 +2317,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:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2167,14 +2325,14 @@ msgstr ""
 "Gajim automaticky zobrazí nově přijatou zprávu v novém okně nebo v záložce "
 "existujícího rozhovoru"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim Vás upozorní o nové zprávě pomocí popupu v pravém dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2182,7 +2340,7 @@ msgstr ""
 "Gajim Vás upozorní o nově připojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2190,70 +2348,70 @@ msgstr ""
 "Gajim Vás upozorní o přávě odpojených kontaktech pomocí popupu v pravém "
 "dolním rohu obrazovky"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim pouze změní ikonu kontaktu, který odeslal novou zprávu"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Průvodce vytváření účtu"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Obecné"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Křestní:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Skupina:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP připojení"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Nápověda online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Skryje okno"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Dom. stránka:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Počítač: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Už mám účet který bych rád(a) použil(a)"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Chtěl(a) bych za_registrovat nový účet"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Chtěla bych si Vás přidat do mého Seznamu."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Pokud bude zaškrtnuto, Gajim bude mít také ikonu v traybaru"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat avatary kontaktů v okně Seznamu"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2261,15 +2419,15 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude zobrazovat popisy stavů kontaktů pod jménem v "
 "oknÄ› Seznamu"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Pokud je zaškrtnuto, Gajim se připojí do této místnosti při spuštění"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Pokud bude zaškrtnuto, Gajim si bude pamatovat heslo pro tento účet"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2277,7 +2435,7 @@ msgstr ""
 "Pokud bude zaškrtnuto, Gajim si bude pamatovat polohy a velikosti Seznamu a "
 "oken rozhovorů po příštím spuštění"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2285,7 +2443,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim nahradí ascii smajlíky jako ':)' za ekvivalentní "
 "grafické smajlíky"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2293,7 +2451,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim bude posílat keep-alive pakety, aby předešel ztrátě "
 "spojení způsobenou nečinností"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2301,7 +2459,7 @@ msgstr ""
 "Pokud zaškrtnuto, Gajim uloží heslo v ~/.gajim/config s právem čtení pouze "
 "pro Vás"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2311,14 +2469,14 @@ msgstr ""
 "z MSN bude mít odpovídající ikonu msn pro stavy připojen, pryč, nerušit, "
 "atd...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 "Pokud zaškrtnuto, Gajim po spuštění se automaticky připojí pomocí tohoto účtu"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2327,7 +2485,7 @@ msgstr ""
 "Pokud zaškrtnuto, jakákoliv změna globálního stavu (pomocí comboboxu na "
 "spodní straně Seznamu) změní stav tohoto účtu také"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2335,167 +2493,180 @@ msgstr ""
 "Máte-li 2 nebo více účtů a je zaškrtnuto, Gajim zobrazí všechny kontakty "
 "jako by byly z jednoho účtu"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Příchozí zpráva:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Query"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informace o Vás, jak jsou uloženy na serveru"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Přijata pozvánka"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Latinka"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Vstoupit do _Diskuze"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Poloha"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Spravuj účty"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Spravuj záložky"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Spravuj smajlíky"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Spravuj profily Proxy"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Spravovat..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Střední:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Více"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Jméno:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Přezdívka"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Žádný"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Upozorni mě na kontakty které se: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Při každé _zprávě"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Odeslat zprávu a zavřít okno"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Otevřít..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Šifrování"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Nebo vyberte předdefinovanou zprávu:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Odchozí zpráva:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Heslo:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Osobní údaje"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefon:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Přehrávat _zvuky"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Pozice:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Nastavení"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Titul:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "ÄŒas tisku:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2505,63 +2676,59 @@ msgstr ""
 "serveru, pokud je připojeno více klientů přes stejný účet. Zprávu obdrží "
 "klient s vyšší prioritou"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Nedávno:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Zaregistrovat"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Odstranit účet _pouze z Gajimu"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstranit účet z Gajimu i ze _serveru"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Odstranit přenos souboru ze výpisu."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Odstraňuji vybraný přenos souboru"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Odpovědět na tuto zprávu"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Vrátit k výchozím barvám"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Zd_roj: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2575,217 +2742,213 @@ msgstr ""
 "'Práce' zároveň. Zdroj, který má nejvyšší prioritu obdrží zprávy. (více "
 "následuje)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Postavení:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Nastavení místnosti"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Místnost:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Uložit _heslo (nebezpečné)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložit _historii pro všechny kontakty"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Uložit _heslo"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Najít"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "O_deslat"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Odeslat Soubor"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Odeslat jednoduchou _zprávu"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Odeslat _Soubor"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Pošli _Novou zprávu..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Odesílat keep-alive pakety"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Odeslat zprávu"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Odeslat zprávu a zavřít okno"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Vlastnosti serveru"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Nastavit MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Nastavit Zprávu dne"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Nastavit _Avatara"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Nastavit avatara když se připojuji"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Nastaví Zprávu dne"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Zobrazit všechny čekající _události"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Zobrazit _odpojené kontakty"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Zobrazit _Seznam"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Zobrazit _XML konzoli"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Zobrazit pouze v _Seznamu"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Přihlásí"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Odhlásí"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Seřadit podle stavu"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Začít _rozhovor"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Stav"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Zastavuji přenos souboru"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Ulice:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Předmět:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Žádost o autorizaci"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Autorizace:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Za jménem:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizovat stav účtu s globálním stavem"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Barva textu:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Písmo textu:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Text stavu automaticky pryč"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Text stavu nedostupný"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Téma:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2793,79 +2956,75 @@ msgstr ""
 "Tato akce smaže jeden přenos souboru z výpisu. Pokud je přenos aktivní, bude "
 "nejdříve zastaven a potom smazán"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titul:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Příjemce:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Přepnout Open_PGP šifrování"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Napište nový popis stavu:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Podtržení"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Upravit MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Upravit Zprávu dne"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Upraví Zprávu dne"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Použít _SSL (staré)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "_Používat smajlíky"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Používej ikony _transportů"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Používa_t jedno okno se záložkami"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Použij autentifikaci"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Použít vlastní jméno počítače/port"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Uživatel:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2876,361 +3035,361 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Když je přijata nová zpráva"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Práce"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 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:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Akce"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "Přid_at kontakt..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "Přid_at do Seznamu"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Správce"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Správce"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Rozšířené"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizuj"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Pozadí:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Zakázat"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "_Přidej do záložek"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Prohlížeč:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Zjednodušený pohled    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Obsah"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopírovat JID/Emailovou adresu"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Kopírovat odkaz"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "O_dmítnout"
 
 # FIXME: chtelo by to cesky vyraz pro service discovery
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Procházet služby..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Diskuze"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikona v systrayi (jinak řečeno v oznamovací oblasti)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Vstoupit do nové místnosti..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "Vy_kopnout"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Zaznamenat historii konverzace"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "Zaznamenávat změny _stavu kontaktů"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "E-_mailový klient:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "Č_len"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Spojit účty"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Zpráva"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Upravit"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "Upravit úč_et..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Jméno: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Upozornit mÄ›"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozornit mě po dokončení přenosu souboru"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Akce účastníků"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Připojení uživatelé"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Otevři Emailový editor"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Otevřít v prohlížeči"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Přehrávač:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "Zobrazit o_kno se zprávou"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Nastavení"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Zveřejnit"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Konec"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "Odst_ranit"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "Odst_ranit ze Seznamu"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Přejmenovat"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Odpovědět"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Získat"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Najít"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "Ode_slat"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "Ode_slat a zavřít"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Odeslat soukromou zprávu"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "Ode_slat zprávu serveru"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "Ode_slat jednoduchou zprávu"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Nastavit obrázek..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Začít rozhovor"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Stav"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Žádat autorizaci"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Autorizace"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Používat proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Uživatel:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML konzole..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "výpis přenosů souborů"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minut"
 
@@ -3240,17 +3399,17 @@ msgstr "minut"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nemůžu otevřít %s pro čtení"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Chyba při čtení souboru:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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"
@@ -3288,92 +3447,102 @@ msgstr "Status je nyní %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status je nyní %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Přepnout na %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s Vám poslal(a) novou zprávu."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s Vám chce poslat soubor."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, 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/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Přenos souboru %(filename)s od %(name)s byl zastaven."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, 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/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Přenos souboru %(filename)s pro %(name)s byl zastaven."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Spojené účty"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Vstoupit do nové místnosti"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Spravovat záložky..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3381,68 +3550,68 @@ msgstr ""
 "Už více nebudete moci posílat i přijímat zprávy od kontaktů z tohoto "
 "transportu."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 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:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Přejme_novat"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Odhlásit"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, 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:1420
+#: ../src/roster_window.py:1438
 #, 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:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3450,28 +3619,28 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Zadej heslo GPG klíče pro účet %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3479,20 +3648,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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3501,30 +3670,30 @@ msgstr ""
 "historii."
 
 # FIXME: nejak divne, asi spatne prelozene
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Změnit popis stavu..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "pomocí účtu "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Skryje toto menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3532,51 +3701,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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s nerozesílá OpenPGP klíč nebo jste žádný nepřiřadil(a)"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Právě jsi obdržela novou zprávu od \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-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/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Pokud zavřete tuto záložku a historie je vypnutá, zpráva bude ztracena."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Odesílání soukromé zprávy selhalo"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "U¾ nejste v místnosti \"%s\" nebo \"%s\" ode¹el(a)."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Šifrování zapnuto"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Šifrování vypnuto"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3584,7 +3709,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:279
+#: ../src/tooltips.py:278
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3592,7 +3717,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:285
+#: ../src/tooltips.py:284
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3600,86 +3725,86 @@ 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Role:"
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Přidružení:"
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Velikost: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Nespuštěno"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Zastaveno"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Dokončeno"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pozastaveno"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Stagnuje"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Přenáším"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Tato služba dosud neodpověděla s detaily"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3693,63 +3818,63 @@ msgstr "Vyber Avatara"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Velikost souboru s obrázkem \"%s\" je příliš velká"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Soubor nesmí být větší než 32 kilobajtů."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 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:294
+#: ../src/vcard.py:291
 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:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 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:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Osobní údaje"
@@ -3758,25 +3883,26 @@ msgstr "Osobní údaje"
 msgid "creating logs database"
 msgstr "vytvářím databázi historie"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s je soubor, ale měl by být adresář"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim se nyní ukončí"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvářím adresář %s "
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s je adresář, ale měl by být soubor"
@@ -3797,37 +3923,37 @@ msgstr "D-Bus není přítomna na tohto stroji nebo modul pythonu chybí"
 msgid "Session bus is not available"
 msgstr "Rozhraní (bus) sezení není dostupné"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 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:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Pryč jako výsledek nečinnosti"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Nedostupný jako výsledek nečinnosti"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Přidat * a [n] k titulku Seznamu?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3835,11 +3961,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:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3847,20 +3973,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3869,17 +3995,21 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 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:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3887,29 +4017,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:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard říká KiB = 1024 bytů, KB = 1000 bytů."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Zobrazit záložku při jediném rozhovoru?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Zobrazit okraj záložky při jediném rozhovoru?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Zobrazit tlačitko zavřít v záložce?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 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:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3917,13 +4047,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3931,7 +4061,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3939,7 +4069,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:168
+#: ../src/common/config.py:179
 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."
@@ -3947,8 +4077,8 @@ msgstr ""
 "pokud zapnuto, Gajim se zeptá na avatara každého kontaktu který neměl "
 "naposledy avatara nebo kterého uložený je příliš starý."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3956,72 +4086,87 @@ msgstr ""
 "Pokud vypnuto, nebudete vidět řádku se stavem v rozhovorech, když kontakt "
 "změní svůj stav."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Užívám si života venku"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4029,7 +4174,7 @@ msgstr ""
 "Zvuk, který bude přehrán, pokud zpráva diskuze obsahuje jedno ze slov v "
 "muc_highlight_words, nebo když obsahuje Vaši přezdívku."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4038,61 +4183,66 @@ msgstr ""
 "bere v úvahu pouze tehdy, je-li zapnuto notify_on_all_muc_messages)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "zelený"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "potraviny"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "člověk"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "mariňák"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "prostý"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Nelze vstoupit do místnosti"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 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:458
+#: ../src/common/connection.py:511
 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:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Taková místnost neexistuje."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Vytváření místností je zakázané."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Vaše zaregistrovaná přezdívka musí být použita."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Nejste v seznamu členů."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4100,39 +4250,39 @@ 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:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "jsme registrování k %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "žádost o zrušení autorizace od %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "autorizace zrušena od %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojení s účtem \"%s\" bylo ztraceno"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4142,61 +4292,61 @@ msgstr ""
 "na správu Seznamu jako například  http://jru.jabberstudio.org/ k jeho "
 "odstranění"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Připojen k server %s: %s s %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "neviditelný"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "odpojen"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Jsem %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4205,17 +4355,17 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registrační údaje pro trasport %s nedorazily včas"
 
 # FIXME: existuje snad dost kratky vyraz pro timeout
-#: ../src/common/connection.py:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Nastala chyba protokolu:"
 
@@ -4337,10 +4487,6 @@ msgstr "Ne_viditelný"
 msgid "Invisible"
 msgstr "Neviditelný"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Není v seznamu"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Neznámý"
@@ -4428,10 +4574,37 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "azurová"
 
+#~ msgid "account: "
+#~ msgstr "účet: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Jste si jistý(á), že chcete opustit místnosti \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Pokud zavřete toto okno, budete odpojen(a) z těchto místností."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Zapnout/vypnout upozornění při dokončení přenosu souboru"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Odstraňuji vybraný přenos souboru"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Zastavuji přenos souboru"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Používa_t jedno okno se záložkami"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Pokud zavřete tuto záložku a historie je vypnutá, zpráva bude ztracena."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Nelze smazat poslední skupinu"
 
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index cecb53fc7dfdf63f23a6c0704fa082533b2a7148..d64e7a6287ff8ae3fc938cb5b777ab0631b4891e 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\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"
@@ -21,9 +21,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -53,39 +52,8 @@ msgstr "(Kein"
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Chat"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Gruppenchat"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "Konto: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "Nicht in der Liste"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Wechseln zu %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -101,222 +69,377 @@ msgstr ""
 "\n"
 "Falschgeschriebene Wörter werden nicht hervorgehoben"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Keine Verbindung verfügbar"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "Nicht in der Liste"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Chat"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP-Verschlüsselung"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Verschlüsselung aktiviert"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Verschlüsselung deaktiviert"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Sie haben eine neue Nachricht von \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Wenn sie das Fenster schließen und die History abgeschaltet haben, geht die "
+"Nachricht verloren."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Alle %s _Minuten"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Sound"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "Statusbetreff"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "Statusnachricht"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP kann auf diesem Computer nicht genutzt werden"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Sie sind mit dem Server verbunden"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Verbindung muss beendet werden, um Kontonamen zu ändern."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Ungültiger Kontoname"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Kontoname darf nicht leer sein."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Kontoname darf keine Leerzeichen enthalten."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Ungültige Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Ungültiger Eintrag"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Proxy Port muss eine Portnummer sein."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Account nicht verfügbar"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Holen der geheimen Schlüssel fehlgeschlagen"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Wählen Sie ihren OpenPGP Schlüssel"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Name"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "%s ändern"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Auf %s registrieren"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Mitglied"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Besitzer"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrator"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Rausschmeißen"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Rolle:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "%s verbannen"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Was möchten Sie tun?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, 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:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, 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:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrator"
+
+#: ../src/config.py:1961
+#, 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:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Neuer Raum"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 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:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 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:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Account wurde erfolgreich hinzugefügt"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -325,23 +448,23 @@ msgstr ""
 "oder durchklicken des Konto-Menüpunktes im Bearbeiten-Menü des Hauptfensters "
 "erreichen."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Ihr neues Konto wurde erfolgreich erstellt"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Während der Konto-Erstellung ist ein Fehler aufgetreten"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Kontoname ist schon vergeben"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Sie haben bereits ein Konto mit diesem Namen."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -349,48 +472,48 @@ msgstr ""
 "Text unterhalb dieser Linie stellt dar, was seit ihrem letzten Besuch in "
 "diesem Gruppenchat gesagt wurde"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Aktionen für \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "In Wörterbuch URL fehlt ein \"%s\" und ist nicht Wiktionary"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In Websuche URL fehlt ein \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Gestern"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "Vor %i Tagen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -416,12 +539,12 @@ msgstr "JID: <i>%s</i> "
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transports"
 
@@ -477,44 +600,67 @@ msgstr "Der Kontakt befindet sich bereit in Ihrem Roster."
 msgid "A GTK+ jabber client"
 msgstr "Ein GTK+ Jabber-Client"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Ins Deutsche übersetzt von Fridtjof Busse"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnement-Anforderung für Konto %s von %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Betrete Chatraum mit Account %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Betrete Chatraum"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Ungültiger Benutzername"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starte Chat mit Account %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Chat starten"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -523,137 +669,155 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Benutzer hat sich abgemeldet"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Neue Nachricht"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Neue private Nachricht"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Von %s in Raum %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Von %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "An %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "Sie haben ungelesene Nachrichten"
+msgstr[1] "Sie haben ungelesene Nachrichten"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Einzelne Nachricht mit Account %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schrieb:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Sie wurden in den Raum %(room_jid)s von %(contact_jid)s eingeladen"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -700,11 +864,6 @@ msgstr "Dieser Art von Diest enthält keine durchsuchbaren Objekte."
 msgid "Browsing %s"
 msgstr "Durchsuche %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Durchsuche"
@@ -713,30 +872,30 @@ msgstr "_Durchsuche"
 msgid "This service does not contain any items to browse."
 msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Ändern"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Durchsuche %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Benutzer"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -757,7 +916,7 @@ msgstr "Fortschritt"
 msgid "Filename: %s"
 msgstr "Dateiname: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Größe: %s"
@@ -773,8 +932,8 @@ msgstr "Sie"
 msgid "Sender: %s"
 msgstr "Gespeichert in: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Empfänger: "
 
@@ -787,7 +946,7 @@ msgstr "Absender: %s"
 msgid "File transfer completed"
 msgstr "Dateitransfer abgeschlossen"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Öffne Ordner"
 
@@ -811,50 +970,55 @@ msgstr "Datei auswählen..."
 msgid "Send"
 msgstr "Senden"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim kann auf diese Datei nicht zugreifen"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Diese Datei wird von einem anderen Prozess verwendet."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Diese Datei existiert schon"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Was möchten Sie tun?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Datei: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Beschreibung: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s möchte ihnen eine Datei senden:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Datei speichern unter..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Diese Datei existiert schon"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -862,37 +1026,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Ungültige Datei"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Datei: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Es nicht möglich, leere Dateien zu versenden"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Fortsetzen"
 
@@ -1155,38 +1319,38 @@ msgstr ""
 "Argument \"%s\" wurde nicht angegeben. \n"
 "Geben Sie \"%s help %s\" ein für Hilfe"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim benötigt einen laufenden Xserver. Breche ab..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim benötigt PyGTK 2.6 oder höher"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim benötigt GTK 2.6 oder höher"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim benötigt GTK 2.6+. Breche ab..."
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtine fehlt libglade-Unterstützung"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr ""
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1194,78 +1358,78 @@ msgstr ""
 "Bitte stellen Sie sicher, dass gtk und pygtk auf Ihrem System libglade-"
 "Unterstützung besitzen."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorisierung für %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "Fehler beim Senden"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Sie werden den Kontakt ab sofort als offline sehen."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 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:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ist jetzt %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard erfolgreich veröffentlicht"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1275,36 +1439,36 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Logs wurden erfolgreich in die Datenbank migriert."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migriere Logs..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Bitte warten Sie, während die Logs migriert werden..."
 
@@ -1325,152 +1489,98 @@ msgstr "Sie können ihr derzeitiges Theme nicht löschen"
 msgid "Please first choose another for your current theme."
 msgstr "Bitte wählen Sie zuerst einen anderen Namen für ihr derzeitiges Theme."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Möchten Sie die Räume \"%s\" wirklich verlassen?"
-
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
-"Wenn Sie dieses Fenster schließen, wird die Verbindung mit diesen Räumen "
-"abgebrochen."
 
-#. just in one room
-#: ../src/groupchat_window.py:155
-#, 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:79
+msgid "Sending private message failed"
+msgstr "Senden privater Nachricht fehlgeschlagen"
 
-#: ../src/groupchat_window.py:156
-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."
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
+#, 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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Nicht noch einmal fragen"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Gruppenchat"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Dieser Raum hat kein Thema"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s wurde rausgeschmissen: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s wurde gebannt: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sie heißen nun %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s heißt jetzt %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s hat den Raum verlassen"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Thema ändern"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Bitte bestimmen Sie ein neues Thema"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Spitzname ändern"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Bitte geben Sie an, welchen Spitznamen Sie verwenden möchten:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bookmark existiert schon"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Der Raum \"%s\" ist schon in den Bookmarks."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark wurde erfolgreich hinzugefügt"
-
-#: ../src/groupchat_window.py:601
-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"
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Keine Verbindung verfügbar"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Spitzname nicht gefunden: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s scheint keine gültige JID zu sein"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandos: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1483,7 +1593,7 @@ msgstr ""
 "\" enthält. Wenn die JIDderzeit im Raum ist, wird er/sie/es ebenfalls "
 "gebannt. Unterstützt KEINE Leerzeichen im Spitznamen."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1491,12 +1601,12 @@ msgstr ""
 "Bedienung: /%s <Spitzname>, öffnet ein privates Chatfenster mit dem "
 "spezifierten Inhaber."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bedienung: /%s, leert das Textfenster."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1505,12 +1615,12 @@ msgstr ""
 "Bedienung: /%s [Grund], schließt das aktuelle Fenster oder Tab, mit Anzeige "
 "eines Grundes falls angegeben."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Bedienung: /%s, stellt das Gruppenchat-Fenster auf Kompaktmodus."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1519,7 +1629,7 @@ msgstr ""
 "Bedienung: /%s <JID> [Grund], lädt die JID in den aktuellen Raum, optional "
 "mit der Angabe eines Grundes."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1528,7 +1638,7 @@ msgstr ""
 "Bedienung: /%s <Raum>@<Server> [/Spitzname], bietet den Beitritt zu "
 "Raum@Server an, optional mit Spitznamen."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1539,7 +1649,7 @@ msgstr ""
 "Raumes und zeigt optional einen Grund. Unterstützt KEINE Leerzeichen im "
 "Spitznamen."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1548,7 +1658,7 @@ msgstr ""
 "Bedienung: /%s <Aktion>, sendet die Aktion im aktuellen Raum. Verwende "
 "dritte Person, z.B. /%s explodiert)."
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1558,18 +1668,18 @@ msgstr ""
 "Nachrichtenfenster und sendet die Nachricht zum Inhaber des angegebenen "
 "Spitznamen."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Bedienung: /%s <Spitzname>, ändert den Spitznamen im aktuellen Raum."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1577,23 +1687,74 @@ msgstr ""
 "Benutzung: /%s <Nachricht>, sendet eine Nachricht ohne andere Befehle zu "
 "beachten."
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Keine Hilfe vorhanden für /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Nicht noch einmal fragen"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Thema ändern"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Bitte bestimmen Sie ein neues Thema"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Spitzname ändern"
+
+#: ../src/groupchat_control.py:1071
+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:1089
+msgid "Bookmark already set"
+msgstr "Bookmark existiert schon"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Der Raum \"%s\" ist schon in den Bookmarks."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark wurde erfolgreich hinzugefügt"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -1754,42 +1915,38 @@ msgid "Accounts"
 msgstr "Konten"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Benachrichtigung für beendete Dateitransfers ein/ausschalten"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Er_weiterte Aktionen"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Neuen Kontakt hinzufügen"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "_Kontakt hinzufügen"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Erweiterter Konfigurations-Editor"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Nach dem Spitznamen:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Nach der Zeit:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1799,63 +1956,63 @@ msgstr ""
 "Nur beim Schreiben\n"
 "Deaktiviert"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Sende _Betriebssystem-Information"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Erlaube ihm/ihr meinen Status zu sehen"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Auch als iChat-Stil bekannt"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Erfrage Status-Nachricht beim: "
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Darum bitten, seinen/ihren Status zu sehen"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Frage:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Open_PGP-Schlüssel zuweisen"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Automatisch _abwesend nach:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automatisch _nicht verfügbar nach:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Automatisch verbinden"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1867,72 +2024,72 @@ msgstr ""
 "Immer KDE Standard-Anwendungen verwenden\n"
 "Benutzerdefiniert"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Kontakt automatisch autorisieren"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatisch neu verbinden, wenn die Verbindung abbricht"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Vor dem Spitznamen:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Vor der Zeit:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Geburtstag:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Fett"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Personalisierte Anfrage bauen"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Beim Pr_ogrammstart verbinden"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Dateitransfer abbrechen"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Bricht den ausgewählten Dateitransfer ab"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Bricht den ausgewählten Dateitransfer ab und löscht unvollständige Daten"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Pass_wort ändern"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Passwort ändern"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "_Spitzname ändern"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "_Thema ändern"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Sende Statusbenachrichtigungen:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1942,7 +2099,7 @@ msgstr ""
 "sie zuspammt oder belästigt. Verwenden Sie sie mit Vorsicht, da sie alle "
 "Nachrichten von allen Kontakten blockiert, die nicht in ihrer Liste sind."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1954,214 +2111,215 @@ msgstr ""
 "standardmäßig TLS-Verschlüsselung benutzt wenn sie vom Server verwendet wird "
 "und sie TLS mit dieser Option deaktivieren"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "_Schlüssel wählen..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Stadt:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Aufrä_umen"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Klicken, um das Konto-Passwort zu ändern"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klicken Sie, um ein Emoticon einzufügen (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klicken, um die Fähigkeiten (z.B. MSN, ICQ Transporte) auf Jabber-Servern zu "
 "sehen."
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Klicken, um die früheren Unterhaltungen in diesem Raum zu sehen"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Klicken, um die früheren Unterhaltungen mit diesem Kontakt zu sehen"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Client:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Firma:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "_Raum einrichten"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "verbinde, sobald ich Fertig klicke"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Kontakt-Information"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Kontakt-_Info"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Unterhaltungs-Verlauf"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Standard _Status-Symbole:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Lösche MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Lösche Nachricht des Tages"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Löscht die Nachricht des Tages"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Ablehnen"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Abteilung:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Zeige Avatar von Kontakten im Roster"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Zeige die Statusnachricht von Kontakten im Roster"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Gruppen bearbeiten"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Persönliche _Details bearbeiten..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "_Gruppen bearbeiten"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Einschalten"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Erneut eingeben zur Bestätigung:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Neues Passwort eingeben:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Ereignisse"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Alle 5 _Minuten"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Zusatz-Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Nachname:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Dateitransfers"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Dateitransfers"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Dateimanager:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Schriftart:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Schriftart:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Verbiete ihm/ihr meinen Status zu sehen"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: JJJJ-MM-TT"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Häufig gestellte Fragen (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Los"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Thema Einstellungen"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2169,7 +2327,7 @@ msgstr ""
 "Gajim kann Meta-Information, die eine Unterhaltung mit einem Kontakt "
 "betrifft, empfangen und versenden"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2177,7 +2335,7 @@ msgstr ""
 "Gajim zeigt die neu erhaltene Nachricht in einem neuen Chat-Fenster oder "
 "einem Reiter in einem existieren Chat-Fenster"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2185,7 +2343,7 @@ msgstr ""
 "Gajim wird Sie über neue Nachrichten mit einem Popup in der rechten unteren "
 "Ecke des Bildschirms benachrichtigen"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2193,7 +2351,7 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Ecke des "
 "Bildschirmes über Kontakte informieren, die sich gerade angemeldet haben"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2201,71 +2359,71 @@ msgstr ""
 "Gajim wird Sie über ein Popup-Fenster in der rechten unteren Bildschirmecke "
 "über Kontakte informieren, die sich gerade abgemeldet haben"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim wird nur das Symbol des Kontaktes ändern, von dem die neue Nachricht "
 "kommt"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoeinrichtungs-Wizard"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Allgemein"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Vorname:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP Connect"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Online-Hilfe"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Schließt das Fenster"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Hostname: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Ich habe bereits ein Konto, das ich benutzen möchte"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Ich möchte ein neues Konto _erstellen"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Ich würde Dich gerne zu meiner Kontaktliste hinzufügen."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Wenn gewählt, wird Gajim ein Tray-Symbol verwenden"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr "Wenn aktiviert, wird Gajim einen Avatar im Roster-Fenster einblenden"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2273,15 +2431,15 @@ msgstr ""
 "Wenn aktiviert wird Gajim für jeden Kontakt im Roster eine Statusnachricht "
 "unter dem jeweiligen Kontaktnamen anzeigen"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Wenn gewählt, tritt Gajim dem Chatraum beim Programmstart bei"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Falls gewählt, speichert Gajim das Passwort für dieses Konto"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2289,7 +2447,7 @@ msgstr ""
 "Wenn gewählt, merkt sich Gajim die Position und Größe der Kontaktliste auf "
 "dem Bildschirm"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2297,7 +2455,7 @@ msgstr ""
 "Wenn gewählt, wird Gajim ASCII-Smilies wie ':)' mit äquivalenten graphischen "
 "Emoticons ersetzen"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2305,7 +2463,7 @@ msgstr ""
 "Wenn aktiviert, sendet Gajim regelmäßig keep-alive-Pakete, um den "
 "Verbindungsabbruch aufgrund einer Zeitüberschreitung zu verhindern"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2313,7 +2471,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird Gajim das Passwort in ~/.gajim/config mit "
 "'lese' -Rechten nur für Sie"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2323,7 +2481,7 @@ msgstr ""
 "verwenden (Ein Kontakt aus MSN wird z.B. das äquivalente MSN-Symbol für den "
 "Status \"Anwesend\", \"Abwesend\", \"Beschäftigt\", etc... haben)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2331,7 +2489,7 @@ msgstr ""
 "Wenn Sie diese Option wählen, wird Gajim während des Startvorgangs "
 "automatisch zu diesem Konto verbinden"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2341,7 +2499,7 @@ msgstr ""
 "Combobox am Fuße des Kontaktfenster) auch den Status dieses Kontakts "
 "entsprechend ändern"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2349,167 +2507,180 @@ msgstr ""
 "Wenn Sie zwei oder mehr Konten haben und diese Option gewählt ist, wird "
 "Gajim alle Kontakte auflisten, als hätten Sie ein Konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Eingehende Nachricht:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Query"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informationen über Sie, wie sie auf dem Server gespeichert sind"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Einladung empfangen"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "_Chatraum beitreten"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Ort"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Konten Verwalten"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Verwalte Bookmarks"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Emoticons anpassen"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Proxy Verwaltung"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Verwalten..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Mittelname"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Mehr"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Name:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Spitzname:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Kein"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Ãœber Kontakte benachrichtigen, die sich "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "BS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "In jeder _Zeile"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Nachricht senden und Fenster schließen"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP-Verschlüsselung"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Oder wählen Sie eine voreingestellte Nachricht:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Ausgehende Nachricht:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "Pass_wort:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Persönliche Details bearbeiten..."
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefon-Nr.:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "_Klänge abspielen"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Position:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Postleitzahl:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Einstellungen"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Präfix"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Zeit anzeigen:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priori_tät:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2520,65 +2691,61 @@ msgstr ""
 "selben Konto verbunden sind. Der Client mit der höchsten Priorität bekommt "
 "die Ereignisse"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profile, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Anfrage-Baukasten..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Kürzlich:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrieren auf"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Konto entfernen (_nur in Gajim)"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Konto _entfernen (in Gajim und auf dem Server)"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Entferne Dateitransfer von Liste"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Ausgewählten Dateitransfer entfernen"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Nachricht beantworten"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Auf Standard-Farben zurücksetzen"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2593,217 +2760,213 @@ msgstr ""
 "verbinden. Die Ressource mit der höchsten Priorität wird die Nachrichten "
 "erhalten (siehe unten)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Ressource:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Raum-Konfiguration"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Raum:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "_Passphrase speichern (unsicher)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Speichere _Position und Größe der Kontaktliste und Chatfenster"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Unter_haltungsverlauf für alle Kontakte dieses Kontos speichern"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Pass_wort speichern"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Suche"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Sen_den"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Datei Senden"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Einzelne Nachricht Senden"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "_Datei Senden"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Sende _neue Nachricht..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Sende keep-alive Pakete"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Nachricht senden"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Nachricht senden und Fenster schließen"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Fähigkeiten des Servers"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Setze MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Setze Message of the Day"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "_Avatar wählen"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Verwende einen Avater, wenn ich mich verbinde"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Setzt Message of the Day"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Zeige alle schwebenden _Ereignisse"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "_Abgemeldete Kontakte anzeigen"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "_Roster anzeigen"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Zeige _XML Konsole"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Nur in der _Kontaktliste anzeigen"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr "Zeigt eine Liste von Dateitransfers"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_anmelden"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "a_bmelden"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Kontakte nach Status sortieren"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "_Chat starten"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Staat:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Statusnachricht:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Bricht den ausgewählten Dateitransfer ab"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Straße:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Thema:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Abonnementanfrage"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Abonnement:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Suffix:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Konto-Status mit globalem Status abgleichen"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Text_farbe:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Schrift_art:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Automatische Statusnachricht für Abwesend"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Automatische Statusnachricht für Nicht verfügbar"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Thema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2811,79 +2974,75 @@ msgstr ""
 "Diese Aktion entfernt einen Dateitransfer von der Liste. Falls der Transfer "
 "aktiv ist, wird er erst gestoppt, dann entfernt"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "An:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "OpenG_PG Verschlüsselung aktivieren"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Geen Sie Ihre neue Statusnachricht ein:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Art:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Unterstreichen"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "MOTD Aktualisieren"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Aktualisiere Nachricht des Tages (MOTD)"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Aktualisiert Message of the Day"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "_SSL verwenden"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "_Emoticons verwenden"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "_Transport-Symbole verwenden"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Ein einzelnes Chat-Fenster mit _Reitern verwenden"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Verwende Authentifizierung"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Verwende benutzerdefinierten Hostname und Port"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Benutzer-ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2895,15 +3054,15 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Wenn neue Nachricht empfangen wird"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Arbeit"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2911,346 +3070,346 @@ msgstr ""
 "Sie müssen ein Konto erstellen, bevor Sie zum Jabber-Netzwerk verbinden\n"
 "können."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Ihre JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Aktionen"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "Kontakt _Hinzufügen..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "Zur Kont_aktliste hinzufügen"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "Erweitert"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorisieren"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Hintergrund:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Verbannen"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Raum zu _Bookmarks hinzufügen"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakte Ansicht Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "In_halte"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "Email-Adresse _kopieren"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "Link-Adresse _kopieren"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Ablehnen"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Durchsuche Dienste..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Verlauf"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_Info/Query"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "Symbol im Systemabschn_itt (Benachrichtigungs-Bereich)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Neuen Raum betreten"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Rausschmeißen"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "Unterhaltungs-Ver_lauf"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Logge die Statusveränderungen von Kontakten"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Mail-Programm:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Mitglied"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "Konten _zusammenführen"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Nachricht"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Ändern"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "Konto bearbeiten"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Name: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nie"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "Be_nachrichtigen"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Benachrichtige mich, wenn der Dateitransfer abgeschlossen ist"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Benutzer Aktionen"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Angemeldete Benutzer"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "Email-Programm _öffnen"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "Link _öffnen"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Besitzer"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Player:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Öffnen"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Einstellungen"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Anwesenheit"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Veröffentlichen"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "Entfernen von _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "Antwo_rten"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "Ab_rufen"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Suche"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Senden"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Senden & Schließen"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "Private Nachricht _Senden"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Sende Servernachricht"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "Sende _einzelne Nachricht"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "Bild wählen..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "Chat starten"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Abonnieren"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "Abonnement"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Proxy benutzen"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Benutzername:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Stimme verleihen"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML Konsole..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "Dateitransfer-Liste"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "Minuten"
 
@@ -3260,17 +3419,17 @@ msgstr "Minuten"
 msgid "Error: cannot open %s for reading"
 msgstr "Fehler: Kann %s kann nicht zum Lesen öffnen"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Fehler beim Lesen der Datei:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3310,93 +3469,103 @@ msgstr "Status ist jetzt: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status ist jetzt: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Wechseln zu %s"
+
+#: ../src/notify.py:145
 #, python-format
 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s hat Ihnen eine neue Nachricht gesendet."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s möchte ihnen eine Datei senden."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Sie haben %(filename)s erfolgreich von %(name)s erhalten."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Dateitransfer %(filename)s von %(name)s wurde gestoppt."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Sie haben%(filename)s erfolgreich an %(name)s gesendet."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Dateitransfer von %(filename)s an %(name)s wurde gestoppt."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Konten zusammenführen"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Neuen Raum betreten"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Verwalte Bookmarks..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "an %s Konto"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "mit %s Konto"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "mit Konto %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3404,67 +3573,67 @@ msgstr ""
 "Sie können nun keine Nachrichten mehr mit Kontakten von diesem Transport "
 "austauschen."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "_Umbenennen"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Abmelden"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3472,29 +3641,29 @@ 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, 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:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3502,204 +3671,157 @@ 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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 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:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "Ändere _Statusnachricht..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "mit Konto"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Versteckt dieses Menü"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d ungelesene Nachricht"
 msgstr[1] "Gajim - %d ungelesene Nachricht"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"%s hat keinen OpenPGP-Schlüssel verbreitet und Sie haben keinen zugewiesen"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Sie haben eine neue Nachricht von \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Wenn sie das Fenster schließen und die History abgeschaltet haben, geht die "
-"Nachricht verloren."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Wenn Sie diesen Reiter schließen und die History abgeschaltet haben, ist die "
-"Nachricht verloren."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Senden privater Nachricht fehlgeschlagen"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Sie sind nicht mehr im Raum \"%s\" oder \"%s\" hat den Raum verlassen."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Verschlüsselung aktiviert"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Verschlüsselung deaktiviert"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d ungelesene Nachricht"
 msgstr[1] "Gajim - Eine ungelesene Nachricht"
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, 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 - Eine ungelesene Nachricht"
 
-#: ../src/tooltips.py:285
+#: ../src/tooltips.py:284
 #, 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 - Eine ungelesene Nachricht"
 
-#: ../src/tooltips.py:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Rolle:"
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Zugehörigkeit: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Größe: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Ãœbertragen: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Angehalten"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Abgeschlossen"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Unterbrochen"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Steht still"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Ãœbertrage"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Dieser Dienst hat nicht mit detaillierten Informationen geantwortet"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3713,24 +3835,24 @@ msgstr "Avatar auswählen"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Die Dateigröße des Bildes \"%s\" ist zu groß"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Die Datei darf nicht größer als 32 Kilobytes sein."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3738,7 +3860,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
 "sindnicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3746,14 +3868,14 @@ msgstr ""
 "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
 "sieist nicht an ihren interessiert"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3761,24 +3883,24 @@ msgstr ""
 "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie "
 "istnicht interessiert an ihrer"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Persönliche Details bearbeiten..."
@@ -3787,25 +3909,26 @@ msgstr "Persönliche Details bearbeiten..."
 msgid "creating logs database"
 msgstr "Erstelle Log-Datenbank"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s ist eine Datei, kein Verzeichnis"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim wird nun beendet"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "Erstelle Verzeichnis %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s ist ein Verzeichnis, sollte aber eine Datei sein"
@@ -3828,39 +3951,39 @@ msgstr "D-Bus auf diesem Computer nicht vorhanden oder das Python-Modul fehlt"
 msgid "Session bus is not available"
 msgstr "Session-Bus nicht verfügbar"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr ""
 "Verwende DBus und Benachrichtigungs-Daemon um Benachrichtigungen zu zeigen"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Abwesend, da untätig"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Nicht verfügbar, da untätig"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Füge * und [n] in die Kontaktleiste?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3868,12 +3991,12 @@ msgstr ""
 "Wie viele Zeilen von der vorherigen Unterhaltung gespeichert werden, wenn "
 "ein Chat Tab/Fenster wieder geöffnet wird."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3881,20 +4004,20 @@ msgstr ""
 "Sende Nachricht mit Strg+Enter und mache bei Enter einen Zeilenumbruch "
 "(Mirabilis ICQ-Client Standardeinstellung)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Kompaktansicht verwenden, wenn Sie ein Chatfenster öffnen"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3903,19 +4026,23 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fragen, bevor ein Gruppenchat Tab/Fenster geschlossen wird."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3923,23 +4050,23 @@ msgstr ""
 "Überschreibt den Host für Datenübertragung für den Fall von NAT/Port-"
 "Forwarding"
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-Standard sagt KiB = 1024 Byte, KB = 1000 Byte."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Tab bei einer einzelnen Unterhaltung anzeigen?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Tab-Grenze bei nur einer Konversation anzeigen?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Schließen-Button im Tab anzeigen?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3947,7 +4074,7 @@ msgstr ""
 "Eine mit Semilkolon getrennte List von Worten, die in einem Gruppenchat "
 "hervorgehoben werden."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3956,11 +4083,11 @@ msgstr ""
 "geklickt wird.Diese Option wird nur beachtet, wenn die Trayicon-"
 "Unterstützung aktiv ist."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3968,7 +4095,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3976,7 +4103,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:168
+#: ../src/common/config.py:179
 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."
@@ -3984,8 +4111,8 @@ msgstr ""
 "Falls aktiviert fragt Gajim nach einem Avatar für jeden Kontakt, der beim "
 "letzten Mal keinen hatte oder einen veralteten hat."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3993,72 +4120,87 @@ msgstr ""
 "Falls deaktiviert, werden Sie keine Statuszeile im Chat sehen, wenn ein "
 "Kontaktseinen Status und/oder seine Statusnachricht ändert."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Bin gleich wieder da"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, also hinterlasst eine Nachricht."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Arbeit"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Ich bin draußen und genieße das Leben"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4067,7 +4209,7 @@ msgstr ""
 "muc_highlights_works-Liste enthält oder wenn die Nachricht Ihren Nickname "
 "erhält."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4076,61 +4218,66 @@ msgstr ""
 "wirdnur beachtet, wenn notify_on_all_muc_messages aktiviert ist)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "grün"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "gemüse"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "menschlich"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "plain"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Fehler beim Betreten des Raum"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 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:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Sie sind aus diesem Raum gebannt"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Dieser Raum existiert nicht."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Raumerstellung ist beschränkt"
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Sie müssen Ihren registrierten Spitznamen verwenden"
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Sie sind nicht in der Mitgliedliste"
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4139,39 +4286,39 @@ msgstr ""
 "Benutzer registriert.\n"
 "Bitte geben Sie einen anderen Benutzernamen an:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "wir haben jetzt %s abonniert"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Anfrage zur Kündigung des Abonnements von %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s hat das Abonnement beendet"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbindung mit Konto \"%s\" abgebrochen"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4181,61 +4328,61 @@ msgstr ""
 "VerwendenSie ein Roster-Managmenttool wie http://jru.jabberstudio.org/ um "
 "ihn zu entfernen."
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbunden mit Server %s:%s mit %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 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:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "unsichtbar"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "abgemeldet"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Ich bin %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4244,17 +4391,17 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Es ist ein Protkollfehler aufgetreten"
 
@@ -4376,10 +4523,6 @@ msgstr "_Unsichtbar"
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Nicht in der Liste"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Unbekannt"
@@ -4467,10 +4610,40 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "account: "
+#~ msgstr "Konto: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Möchten Sie die Räume \"%s\" wirklich verlassen?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Wenn Sie dieses Fenster schließen, wird die Verbindung mit diesen Räumen "
+#~ "abgebrochen."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Benachrichtigung für beendete Dateitransfers ein/ausschalten"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Ausgewählten Dateitransfer entfernen"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Bricht den ausgewählten Dateitransfer ab"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Ein einzelnes Chat-Fenster mit _Reitern verwenden"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Wenn Sie diesen Reiter schließen und die History abgeschaltet haben, ist "
+#~ "die Nachricht verloren."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Letzte Gruppe kann nicht entfernt werden"
 
@@ -4537,9 +4710,6 @@ msgstr "cyan"
 #~ msgid "Chat with"
 #~ msgstr "Unterhalten mit"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
 #~ msgid "Send New Message"
 #~ msgstr "Sende Neue Nachricht"
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index 585cbf09628061ca472bc9984111e27c598ccde4..a75020b2ab08b67777461cc2a99e3f9ee1b5e8bc 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-17 23:13+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -27,9 +27,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -59,39 +58,8 @@ msgstr "(Κενή)"
 msgid "Hidden"
 msgstr "Μυστικό"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Κουβέντα"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Ομαδική Συζήτηση"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "λογαριασμός: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "εκτός λίστας επαφών"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Αλλαγή σε %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -107,227 +75,382 @@ msgstr ""
 "\n"
 "Η υπογράμμιση τυπογραφικών λαθών απενεργοποιήθηκε"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Δεν μπορεί να από το μήνυμα σας εκτός αν είστε συνδεδεμένος."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "εκτός λίστας επαφών"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Κουβέντα"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Κρυπτογράφηση OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr ""
+"Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
+"μήνυμα θα χαθεί."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Κάθε %s _λεπτά"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Ενεργοποιημένο"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Γεγονός"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Ήχος"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "τίτλος μηνύματος κατάστασης"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "κείμενο μηνύματος κατάστασης"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Επιλογή Ήχου"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Αρχεία Ήχου Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "Το OpenPGP δεν είναι διαθέσιμο σε αυτόν τον Η/Υ"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Αυτή τη στιγμή είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Για να αλλάξετε το όνομα λογαριασμού, πρέπει να αποσυνδεθείτε."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Μη έγκυρο όνομα λογαριασμού"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να είναι κενό."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Το όνομα λογαριασμού δεν μπορεί να έχει κενά."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Μη έγκυρο Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Μη έγκυρη καταχώρηση"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Ο προσαρμοσμένος αριθμός θύρας του μεσολαβητή πρέπει να είναι αριθμός."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Τέτοιος λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε τον λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες"
 
-#: ../src/config.py:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να τροποποιήσετε τις προσωπικές σας "
 "πληροφορίες"
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Σφάλμα κατά την λήψη μυστικών κλειδιών"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Σφάλμα κατά την λήψη του OpenPGP μυστικών κλειδιών σας."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Κωδικοφράση"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Όνομα"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Διακομιστής"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Επεξεργασία %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Εγγραφή στο %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Μέλος"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Ιδιοκτήτης"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Διαχειριστής"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Ξεφορτώσου τον"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Ρόλος:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Απαγορεύοντας την πρόσβαση στον %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Διαχειριστής"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Κείμενο"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Επιλογή Εικόνας"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαιρώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με τον διακομιστή"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Απαιτείται Κωδικός"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Νέο Δωμάτιο"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε τον σελιδοδείκτη."
 
-#: ../src/config.py:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr ""
 "Πρέπει να δώσετε ένα όνομα χρήστη για την παραμετροποίηση του συγκεκριμένου "
 "λογαριασμού."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Πρέπει να δώσετε έναν κωδικό για τον νέο λογαριασμό."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Ο λογαριασμός προστέθηκε με επιτυχία"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -336,23 +459,23 @@ msgstr ""
 "επιλέγοντας το κουμπί για Προχωρημένους, ή αργότερα εάν επιλέξετε "
 "Λογαριασμοί από το μενού Επεξεργασία στο κυρίως παράθυρο."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Ο νέος σας λογαριασμός δημιουργήθηκε με επιτυχία"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Σφάλμα κατά την διάρκεια δημιουργίας λογαριασμού"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Το όνομα λογαριασμού είναι ήδη σε χρήση"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Έχετε ήδη ένα λογαριασμό με αυτό το όνομα."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -360,48 +483,48 @@ msgstr ""
 "Το κείμενο κάτω από αυτή τη γραμμή είναι ότι έχει λεχθεί από την τελευταία "
 "φορά που κοιτάξατε αυτή την ομαδική συζήτηση"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Ενέργειες για \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση Άρθρου της _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Λείπει ένα \"%s\" από το URL του λεξικού και δεν είναι WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής Αναζήτησης"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Δικτυακή Ανα_ζήτηση γι' αυτό"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Χθες"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "πριν από %i μέρες"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
@@ -427,12 +550,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Μεταφορές"
 
@@ -488,49 +611,72 @@ msgstr "Αυτή η επαφή υπάρχει ήδη στην λίστα επα
 msgid "A GTK+ jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
 "Φίλιππος Παπαδόπουλος <psybases@gmail.com>\n"
 "Σταύρος Γιαννούρης <stavrosg2002@freemail.gr>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Αίτηση εγγραφής για τον λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Μη έγκυρο όνομα χρήστη"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Έναργξη Κουβέντας με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Έναρξη κουβέντας"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -539,137 +685,155 @@ msgstr ""
 "θέλετε να στείλετε ένα μήνυμα συζήτησης"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Σύνδεση Επαφής"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση Επαφής"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Νέο Μήνυμα"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Νέο Μονό Μήνυμα"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Νέο Προσωπικό Μήνυμα"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Από %s στο δωμάτιο %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Από %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Η Μεταφορά Αρχείου Ολοκληρώθηκε"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "σε %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Μονό Μήνυμα με χρήση του λογαριασμού %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Μονό Μήνυμα"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "Ο/Η %s έγραψε:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Έχετε προσκληθεί στο δωμάτιο %(room_jid)s από τον/την %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
@@ -716,11 +880,6 @@ msgstr "Αυτού του είδους η υπηρεσία δεν περιέχε
 msgid "Browsing %s"
 msgstr "Περιήγηση στο %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Περιήγηση"
@@ -729,30 +888,30 @@ msgstr "_Περιήγηση"
 msgid "This service does not contain any items to browse."
 msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικείμενα."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Σάρωση %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Χρήστες"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Περιγραφή"
 
@@ -773,7 +932,7 @@ msgstr "Πρόοδος"
 msgid "Filename: %s"
 msgstr "Όνομα αρχείου: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Mέγεθος: %s"
@@ -789,8 +948,8 @@ msgstr "You"
 msgid "Sender: %s"
 msgstr "Αποστολέας: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
@@ -803,7 +962,7 @@ msgstr "Αποθηκεύτηκε στο: %s"
 msgid "File transfer completed"
 msgstr "Η μεταφορά αρχείου ολοκληρώθηκε"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Άνοιγμα του περιέχοντος φακέλου"
 
@@ -827,50 +986,55 @@ msgstr "Επιλέξτε το αρχείο που θα σταλεί..."
 msgid "Send"
 msgstr "Αποστολή"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Το Gajim δεν έχει πρόσβαση σε αυτό το αρχείο"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Αυτό το αρχείο χρησιμοποιείται από άλλη διεργασία."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Αυτό το αρχείο υπάρχει ήδη."
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Παρακαλώ επιλέξτε την ακριβή ενέργεια</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Αρχείο: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Τύπος: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Περιγραφή: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "O %s επιθυμεί να σας στείλει ένα αρχείο:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Αποθήκευση Αρχείου ως..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Αυτό το αρχείο υπάρχει ήδη."
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -878,37 +1042,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/δεπτ)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Μη έγκυρο αρχείο"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Αρχείο:"
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Δεν είναι δυνατό να στείλετε άδεια αρχεία"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Παύση"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Συνέχεια"
 
@@ -1183,31 +1347,31 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Το Gajim απαιτεί Xserver για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί PyGTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Το Gajim απαιτεί GTK 2.6 ή νεότερο για να εκτελεστεί. Έξοδος..."
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Η libglade λείπει από το GTK+"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1216,7 +1380,7 @@ msgstr ""
 "Παρακαλώ απεγκαταστήστε την τρέχουσα έκοδση του GTK+ και εγκαταστήστε την "
 "τελευταία σταθερή έκδοση από %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1224,77 +1388,77 @@ msgstr ""
 "Παρακαλώ βεβαιωθείτε ότι το GTK+ και το PyGTK του συστήματος σας έχουν "
 "υποστήριξη της libglade"
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Το Gajim χρειάζεται την PySQLite2 για να τρέξει"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Εξουσιοδότηση για %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "σφάλμα κατά την αποστολή"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάσταση της."
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς την χρήση του OpenPGP κλειδιού σας"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1304,37 +1468,37 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Το ιστορικό έχει μεταφερθεί στη βάση δεδομένων με επιτυχία."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Η υποστήριξη για Διαχείριση Συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
 "άρθρωμα του gnome.ui)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Μεταφορά Ιστορικού..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
 
@@ -1355,149 +1519,99 @@ msgstr "Δεν είναι δυνατή η διαγραφή του τρέχοντ
 msgid "Please first choose another for your current theme."
 msgstr "Παρακαλώ επιλέξτε ένα άλλο θέμα πρώτα."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά το δωμάτια."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
+msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/groupchat_window.py:160
-msgid "Do _not ask me again"
-msgstr "Μη_ν με ξαναρωτήσεις"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Ομαδική Συζήτηση"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Αυτό το δωμάτιο δεν έχει θέμα"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "Ο %(nick)s πετάχτηκε έξω: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "Ο %(nick)s έχει απαγορευτεί από τον %(who)s: %(reason)s"
 
-#: ../src/groupchat_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Είστε τώρα γνωστός ως %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "Ο %s είναι τώρα γνωστός ως %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "Ο %s έφυγε"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "Ο %s είναι τώρα %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Αλλαγή Θέματος"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Αλλαγή Ψευδωνύμου"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
-"κεντρικό παράθυρο."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Δεν μπορεί να από το μήνυμα σας εκτός αν είστε συνδεδεμένος."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Δεν βρέθηκε το ψευρώνυμο: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "Το %s δεν φαίνεται να είναι έγκυρο JID"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Δεν βρέθηκε η εντολή: /%s (εάν θέλετε να το πείτε αυτό βάλτε το /say μπροστά)"
 
-#: ../src/groupchat_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Εντολές: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1510,7 +1624,7 @@ msgstr ""
 "Εάν το JID είναι στο δωμάτιο, ο χρήστης θα πεταχτεί έξω επίσης. ΔΕΝ "
 "υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1518,12 +1632,12 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο>, ανοίγει ένα παράθυρο προσωπικής κουβέντας με το "
 "συγκεκριμένο χρήστη."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Χρήση: /%s, καθαρίζει το παράθυρο από το κείμενο."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1532,13 +1646,13 @@ msgstr ""
 "Χρήση: /%s [λόγος], κλείνει το τρέχον παράθυρο ή καρτέλα, ανακοινώνοντας το "
 "λόγο εάν έχει προσδιοριστεί."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr ""
 "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1547,7 +1661,7 @@ msgstr ""
 "Χρήση: /%s <JID> [λόγος], προσκαλεί το JID στο τρέχον δωμάτιο, παρέχοντας "
 "προαιρετικά και λόγο."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1556,7 +1670,7 @@ msgstr ""
 "Χρήση: /%s <δωμάτιο>@<διακομιστής>[/ψευδώνυμο], επιδιώκει την είσοδο στο "
 "δωμάτιο@διακομιστή, προαιρετικά χρησιμοποιώντας το ψευδώνυμο."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1566,7 +1680,7 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [αιτία], βγάζει τον χρήστη που προσδιορίστηκε από το "
 "δωμάτιο, προσδιορίζοντας την αιτία. ΔΕΝ υποστηρίζει κενά στο ψευδώνυμο."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1575,7 +1689,7 @@ msgstr ""
 "Χρήση: /%s <δράση>, στέλνει τη δράση στο τρέχον δωμάτιο, με χρήση τρίτου "
 "προσώπου (π.χ. /%s χοροπηδάει)."
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1584,17 +1698,17 @@ msgstr ""
 "Χρήση: /%s <ψευδώνυμο> [μήνυμα], ανοίγει ένα παράθυρο προσωπικού διαλόγου "
 "και στέλνει το μήνυμα στο χρήστη που προσδιορίστηκε."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Χρήση: /%s <ψευδώνυμο>, αλλάζει το ψευδώνυμο σας στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "Χρήση: /%s [θέμα], εμφανίζει ή αλλάζει το θέμα στο τρέχον δωμάτιο."
 
-#: ../src/groupchat_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1602,23 +1716,72 @@ msgstr ""
 "Χρήση: /%s <μήνυμα>, στέλνει ένα μήνυμα χωρίς να γίνει έλεγχος για άλλες "
 "εντολές."
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Δεν υπάρχουν πληροφορίες για το /%s"
 
+#: ../src/groupchat_control.py:1022
+#, python-format
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από το δωμάτιο \"%s\";"
+
+#: ../src/groupchat_control.py:1023
+msgid "If you close this window, you will be disconnected from this room."
+msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτό το δωμάτιο."
+
+#: ../src/groupchat_control.py:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Μη_ν με ξαναρωτήσεις"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Αλλαγή Θέματος"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Παρακαλώ καθορίστε το νέο θέμα:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Αλλαγή Ψευδωνύμου"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Παρακαλώ καθορίστε το νέο ψευδώνυμο που θέλετε να χρησιμοποιείτε:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Ο σελιδοδείκτης έχει οριστεί ήδη"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Το δωμάτιο \"%s\" υπάρχει ήδη στους σελιδοδείκτες σας."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Ο σελιδοδείκτης προστέθηκε με επιτυχία"
+
+#: ../src/groupchat_control.py:1101
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+"Μπορείτε να διαχειριστείτε τους σελιδοδείκτες από το μενού Ενέργειας στο "
+"κεντρικό παράθυρο."
+
 #. ask for reason
-#: ../src/groupchat_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
@@ -1777,44 +1940,38 @@ msgid "Accounts"
 msgstr "Λογαριασμοί"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr ""
-"Ενεργοποίηση/Απενεργοποίηση ειδοποίησης για όταν ολοκληρωθεί μια μεταφορά "
-"αρχείου"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Ενέργειες για Προ_χωρημένους"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Προσθήκη Νέας Επαφής"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Προσθήκη _Επαφής"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Προχωρημένοι"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Επεξεργασία Ρυθμίσεων για Προχωρημένους"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Μετά από ψευδώνυμο:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Μετά από χρόνο:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1824,64 +1981,64 @@ msgstr ""
 "Μόνο αν κάποιος γράφει ένα μήνυμα\n"
 "Απενεργοποιημένες"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Επίτρεψη α_ποστολής πληροφοριών για το λειτ. σύστημα"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Επέτρεψε τον/την να βλέπει την κατάστασή μου"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Επίτρεψη εμφανίσεων/γνωστοποιήσεων όταν είμαι _απομακρ./μη διαθ./απασχολ./"
 "αφανής"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Επίσης γνωστό ως στυλ iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Ερώτηση μηνύματος κατάστασης όταν γίνομαι:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Ζήτα να βλέπεις την κατάσταση του/της"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Ζητείται:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Ανάθεση Open_PGP Κλειδιού"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 "Εξουσιοδοτήστε μια επαφή ώστε να μπορεί να ξέρει πότε είστε συνδεδεμένος"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Αυτόματα _απομακρυσμένος μετά:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Αυτόματα _μη διαθέσιμος μετά:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Αυτόματη είσοδος"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1893,72 +2050,72 @@ msgstr ""
 "Πάντα χρήση των προεπιλεγμένων εφαρμογών του KDE\n"
 "Προσαρμοσμένες ρυθμίσεις"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Αυτόματη εξουσιοδότηση επαφής"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Αυτόματη επανασύνδεση κατά την απώλεια της σύνδεσης"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Πριν το ψευδώνυμο:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Πριν από χρόνο:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Γενέθλια:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Έντονα"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Σύνδεση κατά την ε_κκίνηση του Gajim"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Ακύρωση της μεταφοράς αρχείου"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Ακυρώνει την επιλεγμένη μεταφορά αρχείου"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Ακυρώνει την επιλεγμένη μεταφορά αρχείου και διαγράφει το ημιτελές αρχείο"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Αλλα_γή Συνθηματικού"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Αλλαγή Κωδικού"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Αλλαγή _Ψευδώνυμου"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Αλλαγή _Θέματος"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Ειδοπ_οιήσεις για κατάσταση κουβέντας:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1968,7 +2125,7 @@ msgstr ""
 "ή άλλα ενοχλητικά μηνύματα. Χρησιμοποιήστε το με προσοχή, γιατί μπλοκάρει "
 "όλα τα μηνύματα από κάθε επαφή που δεν έχετε στην λίστα επαφών σας"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1980,214 +2137,215 @@ msgstr ""
 "κρυπτογράφηση TLS αυτόματα αν αυτή η δυνατότητα του γνωστοποιηθεί από τον "
 "διακομιστή, και ότι με αυτή την επιλογή απενεργοποιείτε το TLS"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Επιλογή _Κλειδιού..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Πόλη:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Εκκα_θάριση"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Πατήστε για να αλλάξετε τον κωδικό του λογαριασμού"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Κάντε κλικ για να εισάγετε φατσούλα (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Πατήστε για να δείτε τα χαρακτηριστικά (όπως μεταφορές MSN, ICQ) των "
 "διακομιστών του jabber"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις σε αυτό το δωμάτιο"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Πατήστε για να δείτε παλιότερες συζητήσεις με αυτή την επαφή"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Εφαρμογή:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Εταιρία:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Τροποποίηση _Δωματίου"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Σύνδεση όταν επιλέξω Τέλος"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Πληροφορίες Επαφής"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Πλη_ροφορίες Επαφής"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Ιστορικό Κουβέντας"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Χώρα:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "_Σετ εικονιδίων κατάστασης:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Διαγραφή MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Διαγραφή Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Διαγράφει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Άρνηση"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 "Αρνηθείτε εξουσιοδότηση σε μια επαφή ώστε να μην μπορεί να γνωρίζει πότε "
 "είστε συνδεδεμένος"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Τμήμα"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Εμφάνιση των άβαταρ των επαφών στην λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Εμφάνιση των μηνυμάτων κατάστασης των επαφών στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "Ε-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Τροποποίηση Ομάδων"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Τροποποίηση Προσωπικών Πληροφοριών..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Επεξεργασία _Ομάδων"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Διαχείριση Συμβόλων"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Ενεργοποίηση"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Επαναπληκτρολογήστε για επιβεβαίωση:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Πληκτρολογήστε νέο κωδικό:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Γεγονότα"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Κάθε 5 _λεπτά"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Επιπλέον Οδός:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Οικογένεια:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Μεταφορές Αρχείων"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Μεταφορές Αρχείων"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Διαχειριστής αρχείων:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Γραμματοσειρά:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Γραμματοσειρά:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Απαγόρευσε τον/την να βλέπει την κατάστασή μου"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Συχνές Ερωτήσεις (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Από:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "Πάμ_ε"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Προσαρμογή Θεμάτων Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2195,7 +2353,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα γνωστοποιεί την ικανότητα του να στέλνει και να "
 "λαμβάνει μετα-πληροφορίες σχετικές με μια συζήτηση που έχετε με μια επαφή"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2203,7 +2361,7 @@ msgstr ""
 "Το Gajim θα εμφανίσει αυτόματα το νέο εισερχόμενο μήνυμα σε ένα νέο παράθυρο "
 "κουβέντας ή σε μια καρτέλα ενός ήδη υπάρχοντος παραθύρου κουβέντας"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2211,7 +2369,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει για το νέο μήνυμα μέσω ενός αναδυόμενου "
 "παραθύρου στο κάτω δεξιά μέρος της οθόνης"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2219,7 +2377,7 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις συνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2227,71 +2385,71 @@ msgstr ""
 "Το Gajim θα σας ειδοποιήσει μέσω ενός αναδυόμενου παραθύρου στο κάτω δεξιά "
 "μέρος της οθόνης για τις επαφές που μόλις αποσυνδέθηκαν στο Jabber"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Το Gajim θα αλλάξει μόνο το εικονίδιο της επαφής που έστειλε το μήνυμα"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Οδηγός Δημιουργίας Λογαριασμού"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Γενικά"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Δοθέν Όνομα"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Ομάδα:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Σύνδεση HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Online βοήθεια"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Αποκρύπτει το παράθυρο"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Προσωπ. Σελίδα:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Ξένιος υπολογιστής:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Έχω ήδη ένα λογαριασμό που θέλω να χρησιμοποιήσω"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "_Επιλέξτε εάν επιθυμείτε να καταχωρήσετε νέο jabber λογαριασμό"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα έχει δικό του εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα άβαταρ των επαφών στην λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2299,17 +2457,17 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα εμφανίζει τα μηνύματα κατάστασης των επαφών σας "
 "κάτω από τα ονόματα τους στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Αν επιλεγεί, το Gajim θα σας συνδέει αυτόματα σε αυτή την ομαδική συζήτηση "
 "κατά την εκκίνηση"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Αν επιλεγεί, το Gajim θα θυμάται τον κωδικό για αυτόν το λογαριασμό"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2317,7 +2475,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα θυμάται την θέση και το μέγεθος του κύριου "
 "παραθύρου την επόμενη φορά που θα εκτελεστεί"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2325,7 +2483,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα μετατρέπει όλα ascii σύμβολα όπως το ':)' με τα "
 "αντίστοιχα γραφικά σύμβολα"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2333,7 +2491,7 @@ msgstr ""
 "Αν επιλεγεί, το Gajim θα στέλνει πακέτα keep-alive ώστε να αποφύγει την "
 "διακοπή της σύνδεσης"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2341,7 +2499,7 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim θα αποθηκεύσει το συνθηματικό στο ~/.gajim/config με "
 "δικαίωμα ανάγνωσης μόνο για εσάς"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2351,7 +2509,7 @@ msgstr ""
 "πρωτόκολλο της επαφής. (πχ. Μια επαφή από το MSN θα έχει το αντίστοιχο msn "
 "εικονίδιο για τις καταστάσεις διαθέσιμος, απομακρυσμένος κλπ..)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2359,7 +2517,7 @@ msgstr ""
 "Εάν επιλεγεί, το Gajim, όταν εκτελεστεί, θα συνδεθεί αυτόματα στο Jabber "
 "χρησιμοποιώντας αυτόν το λογαριασμό"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2369,7 +2527,7 @@ msgstr ""
 "στο κάτω μέρος της λίστας επαφών) θα αλλάζουν ανάλογα την κατάσταση αυτού "
 "του λογαριασμού"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2377,167 +2535,180 @@ msgstr ""
 "Αν έχετε 2 ή περισσότερους λογαριασμούς και έχει επιλεγεί, το Gajim θα "
 "εμφανίζει τις επαφές σας σαν να είχατε ένα λογαριασμό"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Εισερχόμενο μήνυμα:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Πληροφορία/Ερώτηση (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Οι πληροφορίες για εσάς αποθηκεύονται στον διακομιστή"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Παραλήφθηκε μια Πρόσκληση"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Πλάγια"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Συμμετοχή σε _Ομαδική Συζήτηση"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Περιοχή"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Διαχείριση Λογαριασμών"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Διαχείριση Σελιδοδεικτών"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Διαχείριση Συμβόλων"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Διαχείριση Προφίλ Μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Διαχείριση..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Μέσο:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "_Συντονιστής"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Περισσότερα"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Όνομα χρήστη:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Τίποτα"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Ειδοποίηση όταν μια επαφή:"
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "Λειτ. Σύστημα:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Σε κάθε _μήνυμα"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Άνοιγμα..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Κρυπτογράφηση OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Ή διαλέξτε από τα προκαθορισμένα μηνύματα:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Εξερχόμενο μήνυμα:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Κωδικός:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Προσωπικές Πληροφορίες"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Τηλέφωνο:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Αναπαραγωγή _ήχων"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Θύρα: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Θέση:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Τ.Κ.:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Προτιμήσεις"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Πρόθεμα:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Εμφάνιση χρόνου:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Π_ροτεραιότητα:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2548,64 +2719,60 @@ msgstr ""
 "είναι συνδεδεμένες χρησιμοποιώντας τον ίδιο λογαριασμό· Η εφαρμογή με την "
 "μεγαλύτερη προτεραιότητα λαμβάνει τα γεγονότα"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Προφίλ, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Πρωτόκολλο:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Μεσολαβητής:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Πρόσφατα:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Εγγραφή σε"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Αφαίρεση λογαριασμού μόν_ο από το Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Αφαίρεση λογαριασμού από το Gajim και από τον διακομι_στή"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Αφαίρεση της μεταφοράς αρχείου από τη λίστα."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 "Αφαιρεί τις ολοκληρωμένες, ακυρωμένες και αποτυχημένες μεταφορές από τη λίστα"
 
-#: ../src/gtkgui.glade.h:229
-msgid "Removing selected file transfer"
-msgstr "Αφαίρεση επιλεγμένης μεταφοράς αρχείου"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Απάντηση σε αυτό το μήνυμα"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Επαναφορά Προεπιλεγμένων Χρωμάτων"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "_Πόρος: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2620,220 +2787,216 @@ msgstr ""
 "ίδια στιγμή. Ο πόρος με την μεγαλύτερη προτεραιότητα θα λαμβάνει τα "
 "γεγονότα. (βλέπε και πιο κάτω)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Πόρος:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Ρόλος:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Ρυθμίσεις Δωματίου"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Δωμάτιο:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Αποθήκευση _κωδικοφράσης (περιορισμένη ασφάλεια)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 "Αποθήκευση _θέσης και μεγέθους για την λίστα επαφών και για τα παράθυρα "
 "κουβέντας"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Αποθήκευση ιστορι_κού συνομιλιών για όλες τις επαφές"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "_Αποθήκευση"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Αναζήτηση"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Α_ποστολή"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Αποστολή Αρχείου"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Αποστολή ενός _μηνύματος"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Αποστολή _Αρχείου"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "_Νέο Μήνυμα..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Αποστολή πακέτων keep-alive"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Αποστολή μηνύματος"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Αποστολή μηνύματος και κλείσιμο παραθύρου"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Στέλνει ένα μήνυμα στους χρήστες που είναι συνδεδεμένοι σε αυτό το διακομιστή"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Διακομιστής:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Χαρακτηριστικά Διακομιστή"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Ορισμός MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Ορισμός Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Κα_θορισμός Avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Θέλω να καθορίσω το άβαταρ μου όταν συνδεθώ"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Ορίζει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Εμφάνιση όλων των γεγονότων που εκρεμούν"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Εμφάνιση _Αποσυνδεδεμένων Χρηστών"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Εμφάνιση _Λίστας Επαφών"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Κονσόλα _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Εμφά_νισε το μόνο στο κύριο παράθυρο"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr "Δείχνει τη λίστα μεταφορών αρχείων μεταξύ εσάς και άλλων"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "Σύν_δεση"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "Αποσ_ύνδεση"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Ταξινόμηση επαφών βάσει κατάστασης"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Κατάσ_ταση"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Έναρξη _Συζήτησης"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Νομός:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Κατάσταση"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Μήνυμα κατάστασης:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Διακόπτεται η επιλεγμένη μεταφορά αρχείου"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Οδός:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Θέμα:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Αίτηση Εγγραφής"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Εγγραφή:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Κατάληξη:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Συγχρο_νισμός κατάστασης λογαριασμού με την γενική κατάσταση"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Χρώμα _κειμένου:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Γρα_μματοσειρά Κειμένου:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση απομακρυσμένος"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Αυτόματο μήνυμα για κατάσταση μη διαθέσιμος"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Θέμα:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2841,79 +3004,75 @@ msgstr ""
 "Αυτή η ενέργεια αφαιρεί μια μεταφορά αρχείου από τη λίστα. Αν η μεταφορά "
 "είναι ενεργή, τότε πρώτα διακόπτεται και μετά αφαιρείται"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Προς:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Εν/Απενεργοποίηση _Κρυπτογράφησης OpenPGP"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Εισάγετε το νέο μήνυμα κατάστασης:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Τύπος:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Υπογράμμιση"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Ενημέρωση MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Ενημέρωση Μηνύματος της Ημέρας"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Ενημερώνει το Μήνυμα της Ημέρας (MOTD)"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Χρήση _SSL (για λόγους συμβατότητας)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "_Χρήση συμβόλων"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Χρήση σετ _εικονιδίων κατάστασης:"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτέλες"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Χρήση πιστοποίησης"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Χρήση προαρμοσμένου διακομιστή/θύρας"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Ταυτότητα Χρήστη:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../src/gtkgui.glade.h:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2925,15 +3084,15 @@ msgstr ""
 "Συμβάντα για νέα μηνύματα δημιουργούνται μόνο όταν λαμβάνονται μηνύματα από "
 "επαφές με τις οποίες δεν κουβεντιάζετε ήδη"
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Όταν λαμβάνεται ένα νέο γεγονός"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Δουλειά"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2941,346 +3100,346 @@ msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό προτού μπορέσετε\n"
 "να συνδεθείτε στο Jabber"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Το JID σας:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Ενέργειες"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Προσθήκη Επαφής..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Προσθήκη στην Λίστα Επαφών"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Διεύθυνση:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Διαχειριστής"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Διαχειριστής"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "Για Προ_χωρημένους"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Εξουσιοδότηση"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "Χρώμα _Φόντου:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Απαγόρευση Πρόσβασης"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "_Τοποθέτηση Σελιδοδείκτη για αυτό το Δωμάτιο"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Περιηγητής:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Ακύρωση"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Συμπαγής Όψη   Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Περιεχόμενα"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "Α_ντιγραφή JID/Email Διεύθυνσης"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Αντιγραφή Τοποθεσίας Δεσμού"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Άρνηση"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "Εύρεση _Υπηρεσιών"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "Εύρεση _Υπηρεσιών..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_Συχνές Ερωτήσεις"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Ομαδική Συζήτηση"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Εικονίδιο στην περιοχή γνωστοποίησης"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "Σύνδεση σε _Νέο Δωμάτιο..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Καταγραφή ιστορικού κουβέντας"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "Καταγραφή α_λλαγών κατάστασης των επαφών"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Εφαρμογή Αλληλογραφίας:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Μέλος"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Συνένωση λογαριασμών"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Μήνυμα"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Τροποποίηση"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Επεξεργασία Λογαριασμού..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Όνομα: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Ποτέ"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Ειδοποίησε με για αυτό"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Ειδοποίησε με όταν έχει ολοκληρωθεί μια μεταφορά αρχείου"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_Εντάξει"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Ενέργειες για τους Συμμετέχοντες"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Συνδεδεμένοι Χρήστες"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Άνοιγμα Προγράμματος Αλληλογραφίας"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Άνοιγμα Δεσμού σε Περιηγητή"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Ιδιοκτήτης"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Κωδικός:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Παύση"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Αναπαραγωγέας:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Εμφάνισε το"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Θύρα:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Προτιμήσεις"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Παρουσία"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Δημοσιοποίηση"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Έξοδος"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Αφαίρεση"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "Α_φαίρεση από την Λίστα Επαφών"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Απάντηση"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Ανάκτηση"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Αναζήτηση"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Αποστολή"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Αποστολή & Κλείσιμο"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Αποστολή Προσωπικού Μηνύματος"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Αποστολή Μηνύματος Διακομιστή"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Αποστολή Μονού Μηνύματος"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Διακομιστής:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Ορισμός Εικόνας..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Έναρξη κουβέντας"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Κατάσταση"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Εγγραφή"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Εγγραφή"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Χρήση μεσολαβητή"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Όνομα χρήστη:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Φωνή"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Κονσόλα _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "λίστα μεταφορών αρχείων"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "λεπτά"
 
@@ -3290,17 +3449,17 @@ msgstr "λεπτά"
 msgid "Error: cannot open %s for reading"
 msgstr "Σφάλμα: το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Σφάλμα κατά την ανάγνωση του αρχείου:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 msgid "Error parsing file:"
 msgstr "Σφάλμα κατά τη ανάλυση του αρχείου:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3340,92 +3499,102 @@ msgstr "Η κατάσταση είναι τώρα: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Η κατάσταση είναι τώρα: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Αλλαγή σε %s"
+
+#: ../src/notify.py:145
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 msgstr "Ο/Η %(nickname)s στο δωμάτιο %(room_name)s σας έστειλε ένα μήνυμα."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "Ο/Η %s σας έστειλε ένα νέο μήνυμα."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "O/Η %s επιθυμεί να σας στείλει ένα αρχείο."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Λάβατε το αρχείο %(filename)s από τον/την %(name)s επιτυχώς."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s από τον/την %(name)s σταμάτησε."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Έχετε στείλει με επιτυχία το %(filename)s στον/ους %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Η μεταφορά του αρχείου %(filename)s στον/ους %(name)s σταμάτησε."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Συνενωμένοι λογαριασμοί"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Διακομιστής"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Σύνδεση σε Νέο Δωμάτιο"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Διαχείριση Σελιδοδεικτών..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "στον λογαριασμό %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "με χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "για τον λογαριασμό %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3433,68 +3602,68 @@ msgstr ""
 "Δεν θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από αυτή τη "
 "μεταφορά."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "_Μετονομασία"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Σύνδεση"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "Α_λλαγή Μηνύματος Κατάστασης"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από την λίστα επαφών σας"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3502,28 +3671,28 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../src/roster_window.py:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Πληκτρολογήστε την GPG κωδικοφράση για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Αποθήκευση της Κωδικοφράσης"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3531,21 +3700,21 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3553,185 +3722,138 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Αλλαγή Μηνύματος Κατάστασης..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "Αλλαγή Μηνύματος _Κατάστασης..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "χρήση του λογαριασμού"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Απόκρυψη αυτού του μενού"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
 
 #: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d μη αναγνωσμένο μήνυμα"
 msgstr[1] "Gajim - %d μη αναγνωσμένα μηνύματα"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Εάν κλείσετε αυτήν την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
-"μήνυμα θα χαθεί."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Εάν κλείσετε αυτή την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
-"μήνυμα θα χαθεί."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Ρόλος: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Συσχέτιση: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Mέγεθος: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Παύση"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Μεταφέρεται"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Αυτή η υπηρεσία δεν έχει απαντήσει ακόμα με λεπτομερείς πληροφορίες"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3745,24 +3867,24 @@ msgstr "Επιλογή Εικόνας"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Το μέγεθος αρχείου της εικόνας \"%s\" είναι πολύ μεγάλο"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Το αρχείο δεν μπορεί να είναι πάνω από 32 kilobytes."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Άγνωστος"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3770,7 +3892,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3778,12 +3900,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3791,26 +3913,26 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Προσωπικές Πληροφορίες"
@@ -3819,25 +3941,26 @@ msgstr "Προσωπικές Πληροφορίες"
 msgid "creating logs database"
 msgstr "δημιουργία βάσης δεδομένων ιστορικού"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "Το %s είναι αρχείο αλλά πρέπει να είναι φάκελος"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Το Gajim τώρα θα κλείσει"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "δημιουργία φακέλου %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "Το %s είναι κατάλογος αλλά θα έπρεπε να είναι αρχείο"
@@ -3862,42 +3985,42 @@ msgstr ""
 msgid "Session bus is not available"
 msgstr "To Session bus δεν είναι διαθέσιμο"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Χρήση του D-Bus και του δαίμονα ειδοποιήσεων για εμφάνιση ειδοποιήσεων"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε "
 "απομακρυσμένος."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Απομακρυσμένος λόγω αδράνειας"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 "Χρόνος σε λεπτά, μετά από τον οποίο η κατάστασή σας θα αλλάξει σε μη "
 "διαθέσιμος."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Αν είναι αληθές, μην αφαιρείς */_. Έτσι το *αβγ* θα είναι μεν έντονο αλλά τα "
 "* * δεν θα αφαιρεθούν."
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Να προστεθεί * και [n] στον τίτλο της λίστας επαφών;"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3905,12 +4028,12 @@ msgstr ""
 "Πόσες γραμμές από την προηγούμενη συζήτηση θα εμφανίζονται όταν θα "
 "ξανανοίξει μια καρτέλα/παράθυρο κουβέντας."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Πόσα λεπτά θα παραμείνουν οι τελευταίες γραμμές από την προηγούμενη συζήτηση."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3918,20 +4041,20 @@ msgstr ""
 "Αποστολή μηνύματος με Ctrl+Enter και εισαγωγή νέας γραμμής με το Enter (Εξ "
 "ορισμού συμπεριφορά του πελάτη ICQ της Mirabilis)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Πόσες γραμμές να αποθηκευτούν για το Ctrl+KeyUP."
 
 #. which version created the config
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Να χρησιμοποιείται η συμπαγής όψη όταν ανοίγετε ένα παράθυρο κουβέντας"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr "Χρήση συμπαγούς προβολής κατά το άνοιγμα παραθύρου ομαδικής κουβέντας"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3940,19 +4063,23 @@ msgstr ""
 "Είτε δικό σας url με ένα %s σε αυτό όπου %s είναι η λέξη/φρράση ή "
 "'WIKTIONARY' που σημαίνει να γίνεται χρήση του wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Εαν είναι επιλεγμένο, το Gajim μπορεί να ελεγθεί από μακριά χρησιμοποιόντας "
 "το gajim-remote."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Ερώτηση πριν το κλείσιμο καρτέλας/παραθύρου ομαδικής κουβέντας."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3960,30 +4087,30 @@ msgstr ""
 "Προέχει του κεντρικού υπολογιστή που αποστέλουμε για Μεταφορές Αρχείων σε "
 "περίπτωση που υπάρχει μετάφραση διεύθυνσης/προώθηση πόρτας"
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "Το IEC standard υπαγορεύει ότι ΚιΒ = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Να εμφανίζεται καρτέλα όταν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Να εμφανίζεται καρτέλα εάν υπάρχει μόνο μια κουβέντα;"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Προβολή κουμπιού κλεισίματος στην καρτέλα;"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "Μία λίστα με λέξεις χωρισμένες με ερωτηματικά, οι οποίες θα επισημαίνονται "
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3992,11 +4119,11 @@ msgstr ""
 "παραθύρων. Αυτή η ρύθμιση έχει νόημα μόνο εφόσον γίνεται χρήση εικονιδίου "
 "στην μπάρα ειδοποιήσεων."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Αν είναι αληθές, το Gajim καταχωρείται στο xmpp:// σε κάθε έναρξη του."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -4005,7 +4132,7 @@ msgstr ""
 "έχει μη αναγνωσμένα μηνύματα. Σε μερικά θέματα, αυτό το εικονίδιο έχει "
 "κίνηση."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -4013,7 +4140,7 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα εμφανίζει το μήνυμα κατάστασης, εφόσον δεν "
 "είναι άδειο, για κάθε επαφή κάτω από το όνομα επαφής στην λίστα επαφών"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:179
 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."
@@ -4021,8 +4148,8 @@ msgstr ""
 "Αν είναι αληθές, το Gajim θα κοιτάει αν κάθε επαφή που δεν είχε ως τώρα "
 "άβαταρ, έχει τώρα"
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -4031,72 +4158,87 @@ msgstr ""
 "παράθυρα συζητήσεων όταν η επαφή αλλάζει την κατάσταση και/ή τo μύνημα "
 "κατάστασης."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Είμαι έξω στην ζωή"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4104,7 +4246,7 @@ msgstr ""
 "Ο ήχος που θα παιχθεί όταν ληφθεί ένα μήνυμα MUC που περιέχει κάποια λέξη "
 "από αυτές που έχουν οριστεί στο muc_highlight_words, ή στο ψευδώνυμό σας."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4113,61 +4255,66 @@ msgstr ""
 "ισχύει μόνο εάν είναι ορισμένη η notify_on_all_muc_messages)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "πράσινο"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "μανάβικο"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "ζεστό"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "λιτό"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Αδυναμία συμμετοχής στο δωμάτιο"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Απαιτείται συνθηματικό για τη είσοδο σας σε αυτό το δωμάτιο."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Σας έχει απαγορευτεί η είσοδος σε αυτό το δωμάτιο."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Δεν υπάρχει τέτοιο δωμάτιο."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Δεν επιτρέπεται η δημιουργία δωματίων."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Πρέπει να χρησιμοποιηθεί το καταχωρημένο σας ψευδώνυμο."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Δεν είστε στη λίστα μελών."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4175,40 +4322,40 @@ msgstr ""
 "Το επιθυμητό ψευδώνυμο είναι σε χρήση ή καταχωρημένο από κάποιον άλλο.\n"
 "Παρακαλώ προσδιορίστε ένα άλλο παρακάτω:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφών μου."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Ο %s μόλις σας εξουσιοδότησε"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "αίτηση αφαίρεσης εξουσιοδότησης από %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "πραγματοποιήθηκε αφαίρεση εξουσιοδότησης από %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Η σύνδεση με τον λογαριασμό \"%s\" χάθηκε"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4218,61 +4365,61 @@ msgstr ""
 "σας. Χρησιμοποιήστε κάποιο εργαλείο διαχείρισης όπως το http://jru."
 "jabberstudio.org για να το αφαιρέσετε"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη."
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Έγινε σύνδεση με το διακομιστή %s:%s με %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το συνθηματικό σας."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Δεν δόθηκε κωδική-φράση για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "αόρατος"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Είμαι %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4281,18 +4428,18 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 "Πληροφορίες σχετικές με την καταχώριση δεν έφτασαν εγκαίρως για την μεταφορά "
 "%s"
 
-#: ../src/common/connection.py:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Λήξη χρονικού ορίου"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Συνέβει σφάλμα πρωτοκόλου:"
 
@@ -4414,10 +4561,6 @@ msgstr "Αόρατ_ος"
 msgid "Invisible"
 msgstr "Αφανής"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Εκτός λίστας επαφών"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Άγνωστη"
@@ -4505,10 +4648,40 @@ msgstr "έκλεισε το παράθυρο ή την καρτέλα"
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
-#: ../src/common/optparser.py:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "κυανό"
 
+#~ msgid "account: "
+#~ msgstr "λογαριασμός: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Είστε σίγουροι ότι θέλετε να φύγετε από τα δωμάτια \"%s\";"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Αν κλείσετε αυτό το παράθυρο, θα αποσυνδεθείτε από αυτά το δωμάτια."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr ""
+#~ "Ενεργοποίηση/Απενεργοποίηση ειδοποίησης για όταν ολοκληρωθεί μια μεταφορά "
+#~ "αρχείου"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Αφαίρεση επιλεγμένης μεταφοράς αρχείου"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Διακόπτεται η επιλεγμένη μεταφορά αρχείου"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Χρήση ενός παραθύρου κουβέντας με _καρτέλες"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Εάν κλείσετε αυτή την καρτέλα και έχετε απενεργοποιημένο το ιστορικό, το "
+#~ "μήνυμα θα χαθεί."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Η τελευταία ομάδα δεν μπορεί να αφαιρεθεί"
 
@@ -4576,9 +4749,6 @@ msgstr "κυανό"
 #~ msgid "Chat with"
 #~ msgstr "Κουβέντα με"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
 #, fuzzy
 #~ msgid "Send New Message"
 #~ msgstr "Νέο Μήνυμα"
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 483886951b0cd5487885ae19e260d4e2d7c8cdf0..18ca26c0a3101ca4a0b7d14a63051f856bcc244f 100644
--- a/po/es/LC_MESSAGES/gajim.po
+++ b/po/es/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -22,9 +22,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -54,39 +53,8 @@ msgstr "(Ninguno)"
 msgid "Hidden"
 msgstr "Oculta"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Charla"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Grupos de charla"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "cuenta: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "no está en el roster"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Cambiar a %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -102,220 +70,374 @@ msgstr ""
 "\n"
 "El resalto de palabras mal escritas no será usado"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "No hay disponible una conexión"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Tu mensaje no será enviado mientras no estés conectado."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "no está en el roster"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Charla"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Encriptación OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Encriptación activada"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Encriptación desactivada"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
+"perderá."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Cada %s _minutos"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Sonido"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "título del mensaje de estado"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "texto del mensaje de estado"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "GPG no es usable en este ordenador"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Debes estar conectado para navegar los servicios"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Para cambiar el nombre de la cuenta, debes estar desconectado"
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Nombre de cuenta no válido"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "El nombre de la cuenta no puede estar vacío."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "El nombre de la cuenta no puede contener espacios."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "ID de Jabber no válida"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 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:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Entrada no válida"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "El puerto personalizado debe ser un número de puerto"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "No está disponible dicha cuenta"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Error obteniendo las claves secretas"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Ha habido un problema recuperando tus claves secretas OpenPGP"
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Contraseña"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Elige tu clave OpenPGP"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nombre"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Editar %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registrar a %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Miembro"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Propietario"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrador"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr ""
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Expulsar"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Puesto:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Expulsando a %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>¿Qué quieres hacer?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>¿Qué quieres hacer?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>¿Qué quieres hacer?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrador"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>¿Qué quieres hacer?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Imagen"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 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:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nuevo salón"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Debes proporcionar un nombre para configurar esta cuenta."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Debes introducir una contraseña para la nueva cuenta"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "La cuenta ha sido añadida con éxito"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -324,23 +446,23 @@ msgstr ""
 "Avanzado, o más tarde mediante el submenú Cuentas del menú Editar de la "
 "ventana principal."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Tu nueva cuenta ha sido creada con éxito"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Ha ocurrido un error durante la creación de la cuenta"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "El nombre de la cuenta está en uso"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Ya tienes una cuenta usando este nombre"
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -348,48 +470,48 @@ msgstr ""
 "El texto bajo esta línea es lo que ha sido dicho desde la última vez que "
 "prestaste atención a este salón de charla"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Acciones para \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta un \"%s\" en la URL del Diccionario y no está en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Ayer"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "hace %i días"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -415,12 +537,12 @@ msgstr "JID : <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transportes"
 
@@ -476,44 +598,67 @@ msgstr "Este contacto ya está listado en tu roster."
 msgid "A GTK+ jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "créditos de traducción"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, 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:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar a un salón de chat con la cuenta %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Nombre de usuario no válido"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversación con la cuenta %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -522,137 +667,155 @@ msgstr ""
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Las contraseñas escritas en ambos campos deben ser idénticas."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nuevo mensaje privado"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "De %s en el salón %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "A %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "Correo-e"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Nuevo mensaje con la cuenta %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Mensaje:"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escribió:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Has sido invitado al salón %(room_jid)s por %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -699,11 +862,6 @@ msgstr "Este tipo de servicio no contiene ningún elemento a navegar."
 msgid "Browsing %s"
 msgstr "Navegando %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr ""
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Navegar"
@@ -712,30 +870,30 @@ msgstr "_Navegar"
 msgid "This service does not contain any items to browse."
 msgstr "Este servicio no contiene elementos para navegar."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Escaneando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Usuarios"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Descripción"
 
@@ -756,7 +914,7 @@ msgstr "Progreso"
 msgid "Filename: %s"
 msgstr "Nombre de archivo: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Tamaño: %s"
@@ -772,8 +930,8 @@ msgstr "Tú"
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Recipiente: "
 
@@ -786,7 +944,7 @@ msgstr "Guardado en: %s"
 msgid "File transfer completed"
 msgstr "Transferencia de archivo finalizada"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Abrir carpeta contenedora"
 
@@ -810,50 +968,55 @@ msgstr "Elige archivo a enviar..."
 msgid "Send"
 msgstr "Enviar"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim no puede acceder a este archivo"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Este archivo está siendo usado por otro proceso."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Este archivo ya existe"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>¿Qué quieres hacer?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Archivo: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Descripción: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quiere enviarte un archivo:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Guardar archivo como..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Este archivo ya existe"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -861,37 +1024,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Archivo no válido"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Archivo: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "No es posible enviar archivos vacíos"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1153,31 +1316,31 @@ msgstr ""
 "El argumento \"%s\" no se ha especificado. \n"
 "Escribe \"%s help %s\" para más información"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita Xserver para funcionar. Abortando..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necesita PyGTK 2.6 o superior"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necesita GTK 2.6 o superior"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La biblioteca GTK+ necesita soporte de libglade"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1186,7 +1349,7 @@ msgstr ""
 "Por favor elimina tu actual biblioteca GTK+ e instala la última versión "
 "estable desde %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1194,77 +1357,77 @@ msgstr ""
 "Por favor, asegúrate de que gtk y pygtk tienen soporte de libglade en este "
 "sistema."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim necesita PySQLite2 para funcionar"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorización HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "error durante el envío"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción de tí"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Siempre le verás desconectado."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard publicada con éxito"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Tu información personal ha sido publicada con éxito"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1274,35 +1437,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "El registro ha sido migrado satisfactoriamente a la base de datos"
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 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:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migrando el registro..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Por favor, espera mientras el registro está siendo migrado..."
 
@@ -1323,146 +1486,98 @@ msgstr "No puedes eliminar el tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, primero elige otro distinto como tema actual."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "¿Estás seguro de querer abandonar los salones \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Si cierras esta ventana, serás desconectado de estos salones."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Falló el envío del mensaje privado"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, 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_window.py:156
-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."
+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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_No preguntarme otra vez"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Grupos de charla"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Este salón no tiene tema"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s ha sido expulsado por %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s ha sido expulsado: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Eres ahora conocido como %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s es ahora conocido como %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s ha salido"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está ahora %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Cambiando el tema"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Especifica el nuevo tema:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Cambiando alias"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Especifica el nuevo alias que quieres usar:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Marcador ya definido"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "El salón \"%s\" ya se encuentra en tus marcadores."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Marcador añadido con éxito"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Puedes gestionar tus marcadores mediante el menú Acciones de tu roster"
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "No hay disponible una conexión"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Tu mensaje no será enviado mientras no estés conectado."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alias no encontrado: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s no parece ser un JID válido"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1475,7 +1590,7 @@ msgstr ""
 "actualmente en el salón, el/ella puede ser también expulsado. NO soporta "
 "espacio en el alias."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1483,12 +1598,12 @@ msgstr ""
 "Uso: /%s <alias>, abre una ventana de conversación con el ocupante "
 "especificado."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpia de texto la ventana."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1497,12 +1612,12 @@ msgstr ""
 "Uso: /%s [motivo], cierra la ventana o pestaña actual, mostrando el motivo "
 "si se especifica."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1511,7 +1626,7 @@ msgstr ""
 "Uso: /%s <JID> [reason], invita al JID al salón actual, opcionalmente "
 "proveyendo un motivo."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1520,7 +1635,7 @@ msgstr ""
 "Uso: /%s <salón>@<servidor>[/alias], ofrece la entrada a salón@servidor "
 "opcionalmente usando el alias especificado"
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1530,7 +1645,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_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1539,7 +1654,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_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1548,39 +1663,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_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "No hay información de ayuda para /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_No preguntarme otra vez"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Cambiando el tema"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Especifica el nuevo tema:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Cambiando alias"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Especifica el nuevo alias que quieres usar:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Marcador ya definido"
+
+#: ../src/groupchat_control.py:1090
+#, 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:1100
+msgid "Bookmark has been added successfully"
+msgstr "Marcador añadido con éxito"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Expulsando a %s"
@@ -1739,42 +1901,38 @@ msgid "Accounts"
 msgstr "Cuentas"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Activa/Desactiva la notificación de archivo transferido"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Acciones A_vanzadas"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Añadir un contacto"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Añadir un _Contacto"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Dirección"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Editor avanzado de configurción"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Después del nombre:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Después de la hora:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1784,63 +1942,63 @@ msgstr ""
 "Sólo componiendo\n"
 "Desactivado"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Permitir envío de información sobre el sistema operativo"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Permitirle ver mi estado"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "También conocido como estilo iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Preguntar mensaje de estado cuando esté: "
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Pregunta para ver su estado"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Pregunta:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Poner _ausente después de:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Poner _no disponible después de:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Auto conectar"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1852,73 +2010,73 @@ msgstr ""
 "Siempre usar las apliacciones por defecto de KDE\n"
 "Personalizado"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Autorizar contactos automáticamente"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Autoreconectar si se pierde la conexión"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Antes del nombre:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Antes de la hora:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Cumpleaños:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Negrita"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Construir consulta personalizada"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar al inicio de Gajim"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Cancela la transferencia"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Cancela la transferencia de archivo seleccionada"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Cancela la transferencia de archivo seleccionada y elimina el archivo "
 "incompleto"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Cam_biar contraseña"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Cambiar contraseña"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Cambiar _Alias"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Cambiar el _tema"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficaciones del estado del chat"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1928,7 +2086,7 @@ msgstr ""
 "Úsalo con precaución ya que bloqueará todos los mensajes de cualquier "
 "contacto que no esté en tu lista de contactos."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1939,214 +2097,215 @@ msgstr ""
 "use SSL. Observa que Gajim usa encripatdo TLS por defecto si estádisponible "
 "en el servidor, y que con esta opción se desactiva el TLS"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Elegir _clave..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Ciudad:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Limpiar"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Click para cambiar la contraseña de la cuenta"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Haz click para insertar un emoticono (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Click para ver características (como transportes de MSN e ICQ) de los "
 "servidores de Jabber"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Click para ver anteriores conversaciones en este salón"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Click para ver anteriores conversaciones con este contacto"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Compañía:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Configurar el salón"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Conectar cuando presione Finalizar"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Información"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Información"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Histórico de conversaciones"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "País:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "_Iconos de estado por defecto:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Eliminar MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Eliminar mensaje del día"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Elimiina mensaje del día"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Denegar"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Mostrar en el roster los avatares de los contactos"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Mostrar en el roster los mensajes de estado de los contactos"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "Correo-e:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Editar grupos"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "_Editar información personal personales..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Editar grupos"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Gestionar emoticonos"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Introdúcela de nuevo para confirmar:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Introduce nueva contraseña:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Cada 5 _minutos"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Segunda dirección:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transferencias"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Transferencias"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Administrador de archivos:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Estilo:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Fuente:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Prohibirle ver mi estado"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Preguntas frecuentes (en línea)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "I_r"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalización de temas de Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2154,7 +2313,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:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2162,7 +2321,7 @@ msgstr ""
 "Gajim mostrará automáticamente los nuevos mensajes recibidos en una ventana "
 "de charla o pestaña en una ventana de chat existente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2170,7 +2329,7 @@ msgstr ""
 "Gajim te notificará de nuevos mensajes a través de un mensaje emergente en "
 "la esquina inferior derecha de la pantalla"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2178,7 +2337,7 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se conecte"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2186,72 +2345,72 @@ msgstr ""
 "Gajim notificará con un mensaje emergente en la parte inferior derecha de la "
 "pantalla cuando un contacto se desconecte"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim sólo cambiará el icono del contacto que envía el nuevo mensaje"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Asistente para crear una cuenta"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "General"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nombre de pila:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Conectar con HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Ayuda online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Oculta la ventana"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Página web:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Nombre del host:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Ya tengo una cuenta y quiero usarla"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Quiero _registrar una nueva cuenta de Jabber"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Me gustaría añadirte a mi lista de contactos."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Si está marcado, Gajim alojará un icono en el área de notificación del "
 "sistema"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Si está marcado, Gajim mostrará los avatares de los usuarios en el roster"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2259,15 +2418,15 @@ msgstr ""
 "Si está marcado, Gajim mostrará los mensajes de estado de los contactos "
 "debajo de cada nombre en el roster"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Si está marcado, Gajim entrará a este salón al inicio"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Si está marcado, Gajim recordará la contraseña para esta cuenta"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2275,7 +2434,7 @@ msgstr ""
 "Si está marcado, Gajim recordará la posición y tamaño de la ventana de "
 "contactos para futuras ejecuciones"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2283,7 +2442,7 @@ msgstr ""
 "Si está marcado, Gajim reemplazará emoticonos de texto como ':)' por su "
 "equivalente en iconos"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2291,7 +2450,7 @@ msgstr ""
 "Si está marcado, Gajim enviará paquetes de mantenimiento de actividad para "
 "prevenir que expire la conexión"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2299,7 +2458,7 @@ msgstr ""
 "Si está marcado, Gajim guardará la contraseña en ~/.gajim/config con acceso "
 "de lectura sólamente para tí"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2309,7 +2468,7 @@ msgstr ""
 "un contacto de MSN tendrá el icono de msn equivalente para su estado en "
 "línea, ausente, ocupado, etc...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2317,7 +2476,7 @@ msgstr ""
 "Si está marcado, Gajim, cuando se inicie, conectará automáticamente a Jabber "
 "usando esta cuenta."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2327,7 +2486,7 @@ msgstr ""
 "desplegable de la parte inferior de la lista de contactos) cambiará el "
 "estado de esta cuenta de forma acorde"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2335,167 +2494,180 @@ msgstr ""
 "Si tienes dos o más cuentas y está marcado, Gajim listará todos los "
 "contactos de forma mixta"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Mensaje entrante:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Información acerca de tí a guardar en el servidor"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Invitación recibida"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Cursiva"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "ID de Jabber:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Entrar a un grupo de charla"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Dirección"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Gestionar cuentas"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Gestionar marcadores"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Gestionar emoticonos"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Gestionar perfiles del Proxy"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Gestionar..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Medio:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Más"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Alias:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Ninguno"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Notificar cuand un contacto: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "En cada _mensaje"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Enviar mensaje y cerrar ventana"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Encriptación OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "O selecciona un mensaje predefinido:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Mensaje saliente:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Contraseña: "
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Contraseña: "
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Teléfono:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Reproducir _sonidos"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Puerto: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Posición:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Código postal:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Preferencias"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefijo"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Insertar la hora:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Pr_ioridad:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2505,64 +2677,60 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Perfil, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Constructor de consultas..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Recientemente:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrar en"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Eliminar la _cuenta únicamente de Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminar la cuenta de Gajim y del _servidor"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Eliminar transferencias de la lista"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Eliminando las transferencias seleccionadas"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Responder a este mensaje:"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Restablecer colores por defecto"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Re_curso: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2577,219 +2745,215 @@ 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:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Puesto:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Configuración del salón"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Salón:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar contraseña (inseguro)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Grabar conversaciones para todos los contactos"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "_Guardar contraseña"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Buscar"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Enviar"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Enviar archivo"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Enviar _nuevo mensaje..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Enviar paquetes de mantenimiento de actividad"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Enviar mensaje y cerrar ventana"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Características de los servidores"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Definir MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Definir mensaje del día"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Definir Avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Definir un avatar cuando me conecte"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Define el mensaje del día"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos los _eventos pendientes"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Mostrar contactos desconectados"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Mostrar _roster"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Mostrar consola _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Sólo mostrar en la _lista de contactos"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "Conectar"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estado"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Mensaje de estado:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Deteniendo la transferencia seleccionada"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Calle:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Petición de adición"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Subscripción:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Sufijo:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar el estado de la cuenta con el estado global"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Color del texto:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Fuente del texto:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "El mensaje de estado de auto-ausencia"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "El mensaje de estado de no auto-no disponible"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2797,80 +2961,76 @@ msgstr ""
 "Esta acción elimina transferencias de la lista. Si la transferencia está "
 "activa, es primero detenida y luego eliminada"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "A:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar encriptación OpenPGP"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Escribe tu nuevo mensaje de estado:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Subrayado"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Actualizar MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Actualizar mensaje del día"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Actualiza el mensaje del día"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (el viejo)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Usar _emoticonos"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "_Usar los iconos del transporte"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Usar una sola ventana de conversación con pestañas"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Usar autentificación"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Usar nombre de host y puerto personalizados"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Identificador:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2882,360 +3042,360 @@ msgstr ""
 "nuevo mensaje sólo aparecen cuando proceden de un contacto con el que no se "
 "está hablando ya"
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Cuando se reciba un nuevo evento"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Trabajo"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 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:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Tu JID"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Acciones"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Añadir contacto..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Añadir a la lista de contactos"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Dirección:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Administrar"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avanzado"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Fondo"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Banear"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Añadir este salón a marcadores"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "Vista _compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Contenidos"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar la dirección"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Copiar la dirección del enlace"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Denegar"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Descubrir servicios..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icono en el área de notificación"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 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:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "E_ntrar a un nuevo salón..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "Histórico de conversaciones"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Registrar cambios de estado de los contactos"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Cliente de correo:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Miembro"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Combinar las cuentas"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Mensaje"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Modificar cuenta..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Nombre: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Notificarme"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificarme cuando una transferencia finalice"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Acciones"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "Usuarios _online"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Abrir el compositor de correo"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Abrir enlace en navegador"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Propietario"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "C_ontraseña:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Reproductor:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Emerger"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Puerto:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Preferencias"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Presencia"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Salir"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Eliminar"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "Renombrar"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Buscar"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Enviar y Cerrar"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Enviar mensaje privado"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Enviar mensaje de servidor"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Enviar mensaje"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Definir Imagen..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "Iniciar conversación"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Estado"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Añadir"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Subscripción"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Nombre"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Consola _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "lista de transferencias"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutos"
 
@@ -3245,17 +3405,17 @@ msgstr "minutos"
 msgid "Error: cannot open %s for reading"
 msgstr "Error: no se puede abrir %s para lectura"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Error leyendo el archivo:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3294,159 +3454,169 @@ msgstr "El estado es ahora: %(status)s: %(status_msg)s "
 msgid "Status is now: %(status)s"
 msgstr "El estado es ahora: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Cambiar a %s"
+
+#: ../src/notify.py:145
 #, 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"
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s te ha enviado un nuevo mensaje"
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quiere enviarte un archivo."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, 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/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferencia del archivo %(filename)s de %(name)s detenida."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, 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/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferencia de %(filename)s a %(name)s detenida."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Cuentas combinadas"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Servidor"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Entrar en un nuevo salón"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Gestionar marcadores..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 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:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 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:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Re_nombrar"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3454,28 +3624,28 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 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:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3483,19 +3653,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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3503,183 +3673,137 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado"
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Cambiar mensaje de estado..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "usando la cuenta"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Oculta este menú"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s no ha revelado su clave OpenPGP ni tú le has asignado una"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Acabas de recibir un nuevo mensaje de \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Si cierras esta pestaña y tienes el regstro desactivado, este mensaje se "
-"perderá."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Si cierras esta pestaña y tienes el registro desactivado, el mensaje se "
-"perderá."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Falló el envío del mensaje privado"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Ya no estás en el salón \"%s\" o \"%s\" ya no existe."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Encriptación activada"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Encriptación desactivada"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Afiliación: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pausado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Transfiriendo"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 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:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3693,24 +3817,24 @@ msgstr "Elegir avatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "La imagen \"%s\" es demasiado grande"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "El archivo no debe pesar más de 32 kilobytes."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3718,7 +3842,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:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3726,14 +3850,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:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3741,24 +3865,24 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Información personal"
@@ -3767,25 +3891,26 @@ msgstr "Información personal"
 msgid "creating logs database"
 msgstr "creando base de datos de registros"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s es un archivo pero podría ser un directorio"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim se cerrará ahora"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "creando directorio %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s es un directorio pero podría ser un archivo"
@@ -3808,38 +3933,38 @@ msgstr "D-Bus no está presente en esta máquina o falta el módulo python"
 msgid "Session bus is not available"
 msgstr "El bus de la sesión no está disponible"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Usar DBus o el demonio notificador para mostrar notificaciones"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Ausente por inactividad"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "No disponible por inactividad"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "¿Añadir * y [n] en el título del roster?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3847,12 +3972,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:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3860,20 +3985,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3882,18 +4007,22 @@ msgstr ""
 "URL personalizada con %s donde %s es la palabra/frase o 'WIKTIONARY' que "
 "significa usar wiktionary"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 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:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3901,23 +4030,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:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "¿Mostrar pestaña cuando sólo hay una conversación?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 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:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "¿Mostrar botón de cerrar en la pestaña?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3925,7 +4054,7 @@ msgstr ""
 "Una lista de palabras separadas por ';' que serán resaltadas en las "
 "conversaciones de varios usuarios."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3934,11 +4063,11 @@ msgstr ""
 "pulsado. Esta preferencia sólo se activa si se usa el icono del área de "
 "notificación. "
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Si es True, Gajim registra xmpp:// en cada inicio."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3946,7 +4075,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3954,7 +4083,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:168
+#: ../src/common/config.py:179
 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."
@@ -3962,8 +4091,8 @@ msgstr ""
 "Si es True, Gajim pedirá un avatar a cada contacto que no tuvo un avatar la "
 "última vez o se tiene guardado uno demasiado antiguo."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3971,72 +4100,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Estoy disfrutando la vida"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4044,7 +4188,7 @@ msgstr ""
 "Sonido a reproducir cuando un mensaje MUC contiene una de las palabras "
 "listadas en muc_highlight_words, o cuando un mensaje MUC contiene tu alias."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4053,61 +4197,66 @@ msgstr ""
 "preferencia sólo se activa si notify_on_all_muc_messages es False)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr ""
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "No se pudo entrar al salón"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 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:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Estás expulsado de este salón"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "No existe el salón."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "La creación de salones está restringida."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Es necesario usar el alias registrado."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "No estás en la lista de miembros"
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4115,39 +4264,39 @@ msgstr ""
 "Tu alias deseado está en uso o registrado por otro ocupante. \n"
 "Por favor, especifica otro alias abajo:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos ahora suscritos a %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "petición de eliminación de suscripción de %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "ya no estamos suscritos a %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, 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:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4157,62 +4306,62 @@ msgstr ""
 "herramientas de gestión del roster como http://jru.jabberstudio.org/ para "
 "eliminarlo"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado al servidor %s:%s con %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4221,16 +4370,16 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Fuera de tiempo"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Ha ocurrido un error de protocolo:"
 
@@ -4352,10 +4501,6 @@ msgstr "_Invisible"
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "No está en el roster"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Desconocido"
@@ -4443,10 +4588,38 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr ""
 
+#~ msgid "account: "
+#~ msgstr "cuenta: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "¿Estás seguro de querer abandonar los salones \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Si cierras esta ventana, serás desconectado de estos salones."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Activa/Desactiva la notificación de archivo transferido"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Eliminando las transferencias seleccionadas"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Deteniendo la transferencia seleccionada"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Usar una sola ventana de conversación con pestañas"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Si cierras esta pestaña y tienes el registro desactivado, el mensaje se "
+#~ "perderá."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "No se puede eliminar el último grupo"
 
@@ -4506,9 +4679,6 @@ msgstr ""
 #~ msgid "Chat with"
 #~ msgstr "Charlar con"
 
-#~ msgid "E-Mail"
-#~ msgstr "Correo-e"
-
 #~ msgid "Send New Message"
 #~ msgstr "Nuevo mensaje"
 
diff --git a/po/eu/LC_MESSAGES/gajim.po b/po/eu/LC_MESSAGES/gajim.po
index 02d56bf054cf42680e8a581cc053990d530cce24..fb899682a861d5124400f88176be77da31e14d9f 100644
--- a/po/eu/LC_MESSAGES/gajim.po
+++ b/po/eu/LC_MESSAGES/gajim.po
@@ -1,14 +1,14 @@
-
 # Basque translation for gajim
 # Copyright (c) (c) 2005 Canonical Ltd, and Rosetta Contributors 2005
 # This file is distributed under the same license as the gajim package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2005.
 #
+#: ../src/gajim-remote.py:196 ../src/gajim-remote.py:203
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-20 15:13+0100\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2006-01-11 21:52+0100\n"
 "Last-Translator: Urtzi Alfaro <urtzi@altza.net>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -22,11 +22,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ jabber bezeroa"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2
-#: ../src/gtkgui.glade.h:137
-#: ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -56,357 +53,460 @@ msgstr "(Ezer ez)"
 msgid "Hidden"
 msgstr "Ikusezin"
 
-#: ../src/chat.py:186
-#: ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Txat"
+#. FIXME: add a ui for this use spell.set_language()
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
+msgid ""
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
 
-#: ../src/chat.py:188
-#: ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Txat taldea"
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Konexioa ez dago erabilgarri"
 
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "kontua: "
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Zure mezua ezin da bidali konektatu harte"
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467
-#: ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120
-#: ../src/dialogs.py:341
-#: ../src/dialogs.py:380
-#: ../src/dialogs.py:947
-#: ../src/gajim.py:529
-#: ../src/gajim.py:530
-#: ../src/roster_window.py:991
-#: ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435
-#: ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720
-#: ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390
-#: ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485
-#: ../src/roster_window.py:2493
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
 msgid "Not in Roster"
 msgstr "Zerrendan ez dago"
 
-#: ../src/chat.py:555
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Txat"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Ireki OpenPGP enkriptazioa"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, 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 zuk jarritakorik"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "Enkriptazioa aktibatuta"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Enkriptazioa desaktibatuta"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
 #, python-format
-msgid "Switch to %s"
-msgstr "Aldatu %s -ra"
+msgid "You just received a new message from \"%s\""
+msgstr "\"%s\" -tik mezu berri bat jaso duzu"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784
-#: ../src/dialogs.py:1021
+#: ../src/chat_control.py:1189
 msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
+"If you close this tab and you have history disabled, this message will be "
+"lost."
 msgstr ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
+"Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko "
+"duzu."
 
-#: ../src/config.py:184
-#: ../src/config.py:427
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "%s _minuturo"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktibatua"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Gertaera"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Soinua"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "egoera mezuaren izenburua"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "egoera mezuaren testua"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Aukeratu soinua"
 
-#: ../src/config.py:985
-#: ../src/config.py:2058
-#: ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav soinuak"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP ezin da ordenagailu honetan erabili"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Zerbitzarira konektatu zaude dagoeneko"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Kontuko izena aldatzeko deskonektatuta egon behar zara."
 
-#: ../src/config.py:1179
-#: ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Kontu izen baliogabea"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Kontu izena ezin da hustu."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Kontuko izenak ezin du espaziorik izan."
 
-#: ../src/config.py:1192
-#: ../src/config.py:1198
-#: ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID baliogabea"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "\"izena@zerbitzaria\" Jabber ID-a horrela izan behar da."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Sarrera baliogabea"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Bezeroaren portua portu zenbaki bat izan behar da."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Horrelako konturik ez erabilgarri"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361
-#: ../src/dialogs.py:657
-#: ../src/dialogs.py:773
-#: ../src/disco.py:420
-#: ../src/vcard.py:421
-#: ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Konektatzen ez bazara, ezin duzu zure informazio pertsonala aldatu."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Kode sekretua lortzeko huts egitea"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Problema bat egon da zure OpenPGP-ko kode sekretua lortzeko."
 
-#: ../src/config.py:1397
-#: ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Pasa-esaldia"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Aukeratu zure OpenPGP kodea"
 
-#: ../src/config.py:1406
-#: ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Ez da koderik aukeratu"
 
 #. Name column
-#: ../src/config.py:1625
-#: ../src/disco.py:678
-#: ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Izena"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Zerbitzaria"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Editatu %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "%s -ra erregistratua"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Partaidea"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Jabea"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administratzailea"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Bota"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Eginkizuna:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Debekatzen %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Zer nahi duzu egin?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Zer nahi duzu egin?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Zer nahi duzu egin?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administratzailea"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Zer nahi duzu egin?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Testua"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Irudia"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Aukeratu irudia"
 
-#: ../src/config.py:2063
-#: ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "\"%s\"  kontua zerbitzarira konektatu da"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Hau ezabatzen baduzu, konexioa galdu egingo da."
 
-#: ../src/config.py:2175
-#: ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2176
-#: ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2177
-#: ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Gela berria"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Talde agenda honek datu-banku baliogabea du"
 
-#: ../src/config.py:2337
-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:2433
+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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Baliogabeko izena"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Izen bat sartu behar duzu kontu bat sortzeko."
 
-#: ../src/config.py:2563
-#: ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Pasahitz baliogabea"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Kontu berrirako pasahitz bat sartu behar duzu."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Kontua egoki sartua izan da"
 
-#: ../src/config.py:2590
-#: ../src/config.py:2620
-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."
+#: ../src/config.py:2686 ../src/config.py:2716
+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:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Zure kontu berria egoki sortua izan da."
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Errore bat gertatu da kontua sortzen zen bitartean"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Kontu izena erabiltzen ari da"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Jadanik baduzu kontu izen hau erabilgarri."
 
-#: ../src/conversation_textview.py:183
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
+#: ../src/conversation_textview.py:181
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
 msgstr "Beheko testua adi zeuden azken uneko txat taldeko mezuak dira"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "\"%s\" -rako aukerak"
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Irakurri _Wikipedia artikuloa"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Bila ezazu _Hiztegian"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL hiztegia galdu egin da \"%s\" -an eta ez dago WIKTIONARY-an"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL bilatzailea ez da aurkizten \"%s\" -an"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Web _Bilatzailea honetarako"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Atzo"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i egun lehenago"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Gaia: %s\n"
@@ -431,21 +531,13 @@ msgid "JID: <i>%s</i>"
 msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/dialogs.py:120
-#: ../src/dialogs.py:303
-#: ../src/dialogs.py:341
-#: ../src/disco.py:119
-#: ../src/disco.py:120
-#: ../src/disco.py:1199
-#: ../src/roster_window.py:153
-#: ../src/roster_window.py:167
-#: ../src/roster_window.py:194
-#: ../src/roster_window.py:208
-#: ../src/roster_window.py:2386
-#: ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485
-#: ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transportea"
 
@@ -477,7 +569,8 @@ msgstr "Egoera Mezua"
 #: ../src/dialogs.py:292
 #, 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"
+msgstr ""
+"Mesedez bete sartu nahi duzun kontaktuaren informazioa %s kontuan sartzeko"
 
 #: ../src/dialogs.py:294
 msgid "Please fill in the data of the contact you want to add"
@@ -499,45 +592,67 @@ msgstr "Kontaktu hau zure zerrendan dago ezarria jadanik."
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber bezeroa"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Urtzi Alfaro <urtzi@altza.net>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Harpidetza baimena %s kontutik %s kontura"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Harpidetza baimena %s kontutik"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Txat taldera sartu %s kontuarekin"
 
-#: ../src/dialogs.py:671
-#: ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Txat taldean sartu"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Baliogabeko izena"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Txat-a hasi %s kontuarekin"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Txat-a hasi"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -546,163 +661,155 @@ msgstr ""
 "kontaktu ID-a ezarri:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762
-#: ../src/dialogs.py:1143
-#: ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Konexioa ez erablgarri"
 
-#: ../src/dialogs.py:763
-#: ../src/dialogs.py:1144
-#: ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Mesedez begiratu \"%s\" -rekin konektatua zauden."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Konexiorik gabe, ezin duzu zure pasahitza aldatu."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Pasahitza sartu behar duzu."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Pasahitzak desberdinak dira"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Bi lekuetan pasahitza berdina izan behar du."
 
-#: ../src/dialogs.py:832
-#: ../src/gajim.py:358
-#: ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontaktua konektatuta"
 
-#: ../src/dialogs.py:837
-#: ../src/gajim.py:377
-#: ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontaktua deskonektatuta"
 
 #. chat message
-#: ../src/dialogs.py:842
-#: ../src/gajim.py:458
-#: ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Mezu berri bat"
 
 #. single message
-#: ../src/dialogs.py:842
-#: ../src/gajim.py:456
-#: ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Mezu berri bat"
 
-#: ../src/dialogs.py:843
-#: ../src/dialogs.py:847
-#: ../src/gajim.py:412
-#: ../src/notify.py:141
-#: ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Mezu pribatu berri bat"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "%s gelan %s"
 
-#: ../src/dialogs.py:852
-#: ../src/dialogs.py:858
-#: ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "%s -etik"
 
-#: ../src/dialogs.py:854
-#: ../src/gajim.py:876
-#: ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Fitxeroa transferitzeko baimena"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860
-#: ../src/gajim.py:801
-#: ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Fitxero transferitze errorea"
 
-#: ../src/dialogs.py:865
-#: ../src/gajim.py:907
-#: ../src/notify.py:164
-#: ../src/notify.py:173
-#: ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Fitxero transferitzea egina"
 
-#: ../src/dialogs.py:866
-#: ../src/gajim.py:910
-#: ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Fitxero transferentzia gelditua"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "%s -entzat"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "Irakurri gabeko mezu bat duzu"
+msgstr[1] "Irakurri gabeko mezu bat duzu"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "mezu bakarra %s Kontuarekin"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Mezu bakarra"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Bidali %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s idatzia:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konsola %s-rena"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr " XML Konsola"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "%(room_jid)s gelara gonbidatua izan zara %(contact_jid)s -rengatik"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
@@ -720,8 +827,7 @@ msgstr "Konferentzia"
 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:500
+#: ../src/disco.py:498 ../src/disco.py:500
 msgid "Service Discovery"
 msgstr "Zerbitzua aurkitua"
 
@@ -730,11 +836,14 @@ msgid "The service could not be found"
 msgstr "Zerbitzua ez izan da aurkitu"
 
 #: ../src/disco.py:579
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
-msgstr "Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu helbidea eta saiatu berriro."
+msgid ""
+"There is no service at the address you entered, or it is not responding. "
+"Check the address and try again."
+msgstr ""
+"Ez dago zerbitzurik zuk sartu duzun helbidean edo ez du erantzuten. Begiratu "
+"helbidea eta saiatu berriro."
 
-#: ../src/disco.py:583
-#: ../src/disco.py:868
+#: ../src/disco.py:583 ../src/disco.py:868
 msgid "The service is not browsable"
 msgstr "Zerbitzua erabilezina"
 
@@ -747,11 +856,6 @@ msgstr "Zerbitzari honek ez du menurik begiratzeko."
 msgid "Browsing %s"
 msgstr "Begiratzen %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Bilatu"
@@ -760,35 +864,30 @@ msgstr "_Bilatu"
 msgid "This service does not contain any items to browse."
 msgstr "Zerbitzari honek ez du begiratzeko menurik."
 
-#: ../src/disco.py:1090
-#: ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1098
-#: ../src/disco.py:1457
-#: ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Sartu"
 
-#: ../src/disco.py:1202
-#: ../src/gtkgui.glade.h:334
-#: ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Editatu"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Eskaneatzen  %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Erabiltzaileak"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Deskribapena"
 
@@ -804,34 +903,29 @@ msgstr "Ordua"
 msgid "Progress"
 msgstr "Prozesua"
 
-#: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:240
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Filename: %s"
 msgstr "Fitxeroaren izena: %s"
 
-#: ../src/filetransfers_window.py:176
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, 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:185
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:195
 msgid "You"
 msgstr "Zu"
 
-#: ../src/filetransfers_window.py:186
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:186 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Sender: %s"
 msgstr "Bidaltzaile: %s"
 
-#: ../src/filetransfers_window.py:187
-#: ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Hartzailea: "
 
@@ -844,18 +938,15 @@ msgstr "%s gordea"
 msgid "File transfer completed"
 msgstr "Fitxero transferentzia osatua"
 
-#: ../src/filetransfers_window.py:203
-#: ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Ireki fitxeroaren edukia"
 
-#: ../src/filetransfers_window.py:221
-#: ../src/filetransfers_window.py:229
+#: ../src/filetransfers_window.py:221 ../src/filetransfers_window.py:229
 msgid "File transfer canceled"
 msgstr "Fitxero transferentzia ezeztatua"
 
-#: ../src/filetransfers_window.py:221
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:221 ../src/filetransfers_window.py:230
 msgid "Connection with peer cannot be established."
 msgstr "Connection with peer cannot be established."
 
@@ -871,50 +962,55 @@ msgstr "Aukeratu bidaltzeko fitxeroa..."
 msgid "Send"
 msgstr "Bidali"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim-ek ezin du fitxero honetan sartu."
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Beste prozesu batek erabiltzen du orain fitxero hau."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Fitxero hau jadanik badago"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Zer nahi duzu egin?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Fitxeroa: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Mota: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Deskribapena: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s fitxero bat bidali nahi dizu:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Gorde bezala..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Fitxero hau jadanik badago"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -922,41 +1018,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515
-#: ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Fitxero baliogabea"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Fitxeroa:"
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Ez da posible hutsik dauden artxiboak bidaltzea"
 
-#: ../src/filetransfers_window.py:539
-#: ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Izena: "
 
-#: ../src/filetransfers_window.py:541
-#: ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Bidaltzailea: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Etena"
 
-#: ../src/filetransfers_window.py:740
-#: ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Jarraitu"
 
@@ -982,17 +1074,17 @@ msgid "Popups a window with the next unread message"
 msgstr "Popup leihoa hurrengo mezu irakurri gabearekin"
 
 #: ../src/gajim-remote.py:98
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan agertuko dira."
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Zerrendan inprimatu kontaktu guztien lista. Kontaktu horiek hainbat lerrotan "
+"agertuko dira."
 
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:189
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:189 ../src/gajim-remote.py:196
 #: ../src/gajim-remote.py:203
 msgid "account"
 msgstr "kontua"
@@ -1017,8 +1109,7 @@ msgstr "egoera"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "hauetako bat: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
 msgid "message"
 msgstr "mezua"
 
@@ -1027,8 +1118,13 @@ msgid "status message"
 msgstr "egoera mezua"
 
 #: ../src/gajim-remote.py:113
-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 "\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu \"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien egoera aldatzen"
+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 ""
+"\"kontua\" kontuaren egoera aldatu. Ez badago zehaztua, saiatu "
+"\"Sinkronizatu egoera globalarekin\" aukera hautatua duten kontu guztien "
+"egoera aldatzen"
 
 #: ../src/gajim-remote.py:119
 msgid "Shows the chat dialog so that you can send messages to a contact"
@@ -1038,14 +1134,19 @@ msgstr "Txat leihoa erakutsi, honela, kontaktuari mezua bidali diezaiokezu"
 msgid "JID of the contact that you want to chat with"
 msgstr "Txateatu nahi duzun pertsonaren JID-a"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:181
 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:128
-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 "Zerrendako kontaktu bati mezu berri bat bidali. Bai OpenPGP kodea eta baita kontua dira aukerazkoak.´Kontua´ bakarrik zehaztu nahi baduzu, ´OpenPGP koderik´ gabe, bakarrik ´OpenPGP kodea´ -entzat zehaztu."
+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 ""
+"Zerrendako kontaktu bati mezu berri bat bidali. Bai OpenPGP kodea eta baita "
+"kontua dira aukerazkoak.´Kontua´ bakarrik zehaztu nahi baduzu, ´OpenPGP "
+"koderik´ gabe, bakarrik ´OpenPGP kodea´ -entzat zehaztu."
 
 #: ../src/gajim-remote.py:132
 msgid "JID of the contact that will receive the message"
@@ -1071,8 +1172,7 @@ msgstr "Hautatua badago, mezua kontu hau erabiliz bidaliko da."
 msgid "Gets detailed info on a contact"
 msgstr "Kontaktu baten informazioa lortu"
 
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:150
 #: ../src/gajim-remote.py:180
 msgid "JID of the contact"
 msgstr "Kontaktuaren JID-a"
@@ -1142,8 +1242,10 @@ 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:201
-msgid "Returns current status message(the global one unless account is specified)"
-msgstr "Oraingo egoera mezua itzuli(Globala aukeratu ez badago kontu bat aukeratuta)"
+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:223
 msgid "Missing argument \"contact_jid\""
@@ -1203,143 +1305,155 @@ msgstr ""
 "Argument \"%s\" is not specified. \n"
 "Type \"%s help %s\" for more info"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim-ek Xserver behar du abiarazteko. Uzten..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim-ek PyGTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim-ek GTK 2.6 edo handiagoa behar du "
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ rutinak ez du libglade sostengatzen"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
-msgstr "GTK+ rutina borratu eta instalatu ezazu azken bertsio establea %s hemendik"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
+msgstr ""
+"GTK+ rutina borratu eta instalatu ezazu azken bertsio establea %s hemendik"
 
-#: ../src/gajim.py:62
-msgid "Please make sure that GTK+ and PyGTK have libglade support in your system."
-msgstr "Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutela zure sisteman."
+#: ../src/gajim.py:66
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
+msgstr ""
+"Konproba ezazu GTK+ eta  PyGTK  libglade onartzen dutela zure sisteman."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizazioa %s(id: %s)-entzat"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Baimen hau onartzen al duzu?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "errore bat sortu da bidaltzen zen bitartean"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorizazioa baimendua"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "\"%s\" kontaktuak harpidetza borratu dizu"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Beti deskonektatua ikusiko duzu."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "\"%s\" ezin izan da kontaktuan jarri"
 
-#: ../src/gajim.py:579
-#: ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Begiratu zure konexioa edo saiatu berriro beranduago."
 
-#: ../src/gajim.py:688
-#: ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s orain %s da:(%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Zure pasa-esaldia ez da egokia"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Zure OpenPGP koderik gabe konektatu zara."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard publikazioa egina"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Zure informazio pertsonala egoki publikatua izan da."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "cCard publikazioak failatu du"
 
-#: ../src/gajim.py:945
-msgid "There was an error while publishing your personal information, try again later."
-msgstr "Errore bat agertu da zure informazio pertsonala publikatzen zen bitartean, saiatu berriro beranduago."
+#: ../src/gajim.py:1005
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
+msgstr ""
+"Errore bat agertu da zure informazio pertsonala publikatzen zen bitartean, "
+"saiatu berriro beranduago."
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta preferentziak  gorde"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 msgid "GUI Migration failed"
 msgstr "GUI Migrazioak failatu du"
 
-#: ../src/gajim.py:1432
-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 failatu du interfaz grafikoaren bidez. Eraldaketa prozesua beste prozesuen azpian hasiko da. Mesedez itxoin minutu batzuk Gajim abiarazteko."
+#: ../src/gajim.py:1505
+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 failatu du interfaz grafikoaren bidez. Eraldaketa prozesua "
+"beste prozesuen azpian hasiko da. Mesedez itxoin minutu batzuk Gajim "
+"abiarazteko."
 
 #. loop for ever
-#: ../src/gajim.py:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Log-ak egoki eraldatu dira datubasera."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Log-ak eraldatzen..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
 
@@ -1360,245 +1474,280 @@ msgstr "Ezin duzu zure berezko gaia ezabatu"
 msgid "Please first choose another for your current theme."
 msgstr "Please first choose another for your current theme."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Ziur al zaude \"%s\" geletatik atera nahi duzula?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Mezu pribatua bidaltzeak huts egin du"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
+msgstr "Ez zaude gela honetan \"%s\" edo \"%s\" joan da."
 
-#: ../src/groupchat_window.py:160
-msgid "Do _not ask me again"
-msgstr "Ez galdetu berriro"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Txat taldea"
 
-#: ../src/groupchat_window.py:298
-#: ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Gela honek ez du gairik"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s botata izan da%(reason)s -engatik: "
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s debekatu da %(reason)s -engatik:"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s debekatu da %(who)s: %(reason)s"
 
-#: ../src/groupchat_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Orain %s bezala ezaguna zara"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s orain %s bezala ezaguna da"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s deskonektatu da"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s orain %s da"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Gaia aldatuz"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Gai berria zehaztu:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Nick-a aldatu"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Mesedez zehaztu ezazu zuk erabili nahi duzun nick berria:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Talde agenda ezarria"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "\"%s\" gela zure talde agendan dago."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Talde agenda egoki sortu da"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Zure talde agenda moldatu dezakezu zure zerrendako aukera menuaren bidez."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732
-#: ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Konexioa ez dago erabilgarri"
-
-#: ../src/groupchat_window.py:733
-#: ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Zure mezua ezin da bidali konektatu harte"
-
-#: ../src/groupchat_window.py:804
-#: ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910
-#: ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nick-a aurkitugabea: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853
-#: ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s ez du ematen baliozko JID bat denik"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the room, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. Erabiltzen ari den baten nick-a aldatu egin beharko da, baina ez da aldatu beharko   \"@\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango da. Nick-ak EZ du onartzen tarterik. "
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
+"of an occupant may be substituted, but not if it contains \"@\". If the JID "
+"is currently in the room, he/she/it will also be kicked. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"Erabilera:  /%s <nickname|JID> [reason], debekatua JID-a gelatik. Erabiltzen "
+"ari den baten nick-a aldatu egin beharko da, baina ez da aldatu beharko   \"@"
+"\" -rik  badu. JID-a jadanik gelan bada, bera botatata izango da. Nick-ak EZ "
+"du onartzen tarterik. "
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
-msgstr "Erabilera: /%s <nickname>,, ireki txat pribatu bat espezifikatutako erabiltzaileari."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgstr ""
+"Erabilera: /%s <nickname>,, ireki txat pribatu bat espezifikatutako "
+"erabiltzaileari."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Erabilera: %s, testu leihoa itxi."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
+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_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Erabilera: /%s, talde txat-eko leihoa compact moduan jarri."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current room, optionally providing a reason."
-msgstr "Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko arrazoi bat emanez. "
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"providing a reason."
+msgstr ""
+"Erabilera: /%s <JID> [reason], gonbidatu JID-a oraingo gelara, aukerazko "
+"arrazoi bat emanez. "
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
-msgstr "Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen aukeraz nick bat ezarriz."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
+msgstr ""
+"Erabilera:  /%s <room>@<server>[/nickname], eskaini room@server-era sartzen "
+"aukeraz nick bat ezarriz."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the room and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "Usage: /%s <nickname> [reason], borratu nick-aren bidez aukeratutako erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen espazioak nick-an."
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the room and optionally displays a reason. Does NOT support spaces in "
+"nickname."
+msgstr ""
+"Usage: /%s <nickname> [reason], borratu nick-aren bidez aukeratutako "
+"erabiltzailea gelatik eta nahi bada arrazoi bat adierazi. EZ da onartzen "
+"espazioak nick-an."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current room. Use third person. (e.g. /%s explodes.)"
-msgstr "Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
+msgid ""
+"Usage: /%s <action>, sends action to the current room. Use third person. (e."
+"g. /%s explodes.)"
+msgstr ""
+"Erabilera:  /%s <action>, bidali aukeratutako ekintza daukazun oraingo "
+"gelara. Erabili 3. pertsona. (e.g. /%s explodes.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
-msgstr "Usage: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta bidali zehaztutako nick-aren erabiltzailera."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
+msgstr ""
+"Usage: /%s <nickname> [message], ireki mezu pribatuko leiho bat eta bidali "
+"zehaztutako nick-aren erabiltzailera."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Erabilera:  /%s <nickname>, aldatu zure nick-a oraingo gelan."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
-msgstr "Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
+msgstr ""
+"Erabilera: /%s [topic], erakuts arazi edo aktualizatu oraingo gelako gaia."
 
-#: ../src/groupchat_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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."
+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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ez dago laguntza informazioa  /%s -rentzat"
 
-#. ask for reason
-#: ../src/groupchat_window.py:1087
+#: ../src/groupchat_control.py:1022
 #, python-format
-msgid "Kicking %s"
-msgstr "Botatzen %s"
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr "Ziur al zaude \"%s\" gelatik atera nahi duzula?"
 
-#: ../src/groupchat_window.py:1088
-#: ../src/groupchat_window.py:1119
-msgid "You may specify a reason below:"
-msgstr "Arrazoia zehaztu behar duzu behean:"
+#: ../src/groupchat_control.py:1023
+msgid "If you close this window, you will be disconnected from this room."
+msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-#. ask for reason
-#: ../src/groupchat_window.py:1118
-#, python-format
-msgid "Banning %s"
-msgstr "Debekatzen %s"
+#: ../src/groupchat_control.py:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Ez galdetu berriro"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Gaia aldatuz"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Gai berria zehaztu:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Nick-a aldatu"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Mesedez zehaztu ezazu zuk erabili nahi duzun nick berria:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Talde agenda ezarria"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "\"%s\" gela zure talde agendan dago."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Talde agenda egoki sortu da"
+
+#: ../src/groupchat_control.py:1101
+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:1210
+#, python-format
+msgid "Kicking %s"
+msgstr "Botatzen %s"
+
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
+msgid "You may specify a reason below:"
+msgstr "Arrazoia zehaztu behar duzu behean:"
+
+#. ask for reason
+#: ../src/groupchat_control.py:1452
+#, python-format
+msgid "Banning %s"
+msgstr "Debekatzen %s"
 
 #: ../src/gtkexcepthook.py:52
 msgid "A programming error has been detected"
 msgstr "Programazio errore bat detektatu da."
 
 #: ../src/gtkexcepthook.py:53
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
-msgstr "Seguraski ez da garrantzizkoa, baina diseinatzailei abisatu beharko litzateke."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
+msgstr ""
+"Seguraski ez da garrantzizkoa, baina diseinatzailei abisatu beharko "
+"litzateke."
 
 #: ../src/gtkexcepthook.py:59
 msgid "_Report Bug"
@@ -1738,42 +1887,38 @@ msgid "Accounts"
 msgstr "Kontuak"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Aktibatu/Desaktibatu fitxategi bat tranferitzen deneko notifikazioa"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Aukera aurre_ratuak"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Kontaktu berri bat sartu"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Kontaktua _sartu"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Helbidea"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "konfigurazio aurreratuen editorea"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Nick-aren ondoren:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Orduaren ondoren:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1783,23 +1928,24 @@ msgstr ""
 "Konposatzeko bakarrik\n"
 "Desaktibatuta"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Baimena _OS informazioa bidaltzeko"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Baimendu nire egoera ikustea"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Baiemendu popup-notifikazioak Kanpoan/Ez erabilgarri/Ikusezin nagoenean"
+msgstr ""
+"Baiemendu popup-notifikazioak Kanpoan/Ez erabilgarri/Ikusezin nagoenean"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "iChat estiloa bezala ere ezagutua"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
@@ -1807,39 +1953,39 @@ msgstr ""
 "Animatua\n"
 "Estatikoa"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Eskatu egoera mezua, nagoenean:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Bere egoera ikusteko esan"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Eskatu:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Open_PGP kodea zehaztu"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Kontaktu autorizatua beraz, zure egoera ikus dezake"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Automatikoki _kanpoan ondoren:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automatikoki _ez erabilgarri ondoren:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Automatikoki sartu"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1851,929 +1997,1038 @@ msgstr ""
 "Bet KDE-ren berezko aplikazioak erabili\n"
 "Bezeroa"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automatikoki baimendutako kontaktua"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Konektatu berriro konexioa galtzean"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Nick-a baino lehen:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Ordua baino lehen:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Urtebetetzea:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Bold"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Build custom query"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "K_onektatu Gajim irikitzean"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Fitxategi transferentzia kantzelatu"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Kantzelatu aukeratutako fitxategi transferentzia"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
-msgstr "Kantzelatu aukeratutako fitxategi transferentzia eta borratu bukatu gabeko fitxeroa "
+msgstr ""
+"Kantzelatu aukeratutako fitxategi transferentzia eta borratu bukatu gabeko "
+"fitxeroa "
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Al_datu pasahitza"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Aldatu pasahitza"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Aldatu _Nick-a"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Aldatu _Gaia"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Txateko egoeraren no_tifikazioa:"
 
+#: ../src/gtkgui.glade.h:83
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"Hautatu aukera hau bakarrik zerrendan ez duzun norbaitek molestatzen "
+"bazaitu. Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak "
+"blokeatzen ditu."
+
 #: ../src/gtkgui.glade.h:84
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster"
-msgstr "Hautatu aukera hau bakarrik zerrendan ez duzun norbaitek molestatzen bazaitu. Kontu handiz erabili, zerrendan ez dagoen edonoren mezuak blokeatzen ditu."
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
 
 #: ../src/gtkgui.glade.h:85
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-
-#: ../src/gtkgui.glade.h:86
 msgid "Choose _Key..."
 msgstr "Aukeratu _kodea...."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Hiria:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Garbitu"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Sakatu kontuaren pasahitza aldatzeko"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Sakatu emoticon bat ezartzeko (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
+msgstr ""
+"Sakatu Jabber zerbitzariaren zenbait aukera(Msn ,ICQ, transport) ikusteko"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Sakatu gela honetako elkarrizketa zaharrak ikusteko"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Sakatu kontaktu honen elkarrizketa zaharrak ikusteko"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Bezeroa:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Konpainia:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Gela _konfiguratu"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Konektatu bukatu sakatzen dudanean."
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Konektatu"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Kontaktuaren informazioa"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Kontaktuaren _ Informazioa"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Elkarrizketaren historiala"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Estatua:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Berezko _egoera ikurrak:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Borratu MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Eguneko mezua borratu"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Eguneko mezuak borratu"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Ukatu"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Departamentua:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Kontaktuen abatereak ikusi zerrendan"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Erakuts arazi kontaktuen egoera mezua zerrendan"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Taldeak editatu"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Informazio pertsonala editatu..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Editatu _Taldeak"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Emoticon set:"
 msgstr "Emoticonoak ezarri:"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Aktibatu"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Sartu berriro baieztatzeko:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Sartu pasahitz berria:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Gertaerak"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "5 _minuturo"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Helbide gehigarria:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Familia:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Fitxero transferentzia"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fitxero _Transferentzia"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Fitxero administratzaile:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtroa:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Iturburuaren estiloa:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Mota:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Debekatu nire egoera ikustea"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formatua: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Frequently Asked Questions (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Norena:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "J_oan"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim-en gaien kustomizatazailea"
 
+#: ../src/gtkgui.glade.h:138
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact"
+msgstr ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact"
+
 #: ../src/gtkgui.glade.h:139
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact"
-msgstr "Gajim can send and receive meta-information related to a conversation you may have with a contact"
+msgid ""
+"Gajim will automatically show the new received message in a new chat window "
+"or tab in an existing chat window"
+msgstr ""
+"Gajim-ek automatikoki jasotako mezu berriak leiho berri batean edo jadanik "
+"dagoen leiho batean irakutsiko ditu"
 
 #: ../src/gtkgui.glade.h:140
-msgid "Gajim will automatically show the new received message in a new chat window or tab in an existing chat window"
-msgstr "Gajim-ek automatikoki jasotako mezu berriak leiho berri batean edo jadanik dagoen leiho batean irakutsiko ditu"
+msgid ""
+"Gajim will notify you for new message via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim-ek mezu berriaz notifikatuko dizu popup bidez pantailaren beheko "
+"eskubiko aldean"
 
 #: ../src/gtkgui.glade.h:141
-msgid "Gajim will notify you for new message via a popup in the bottom right of the screen"
-msgstr "Gajim-ek mezu berriaz notifikatuko dizu popup bidez pantailaren beheko eskubiko aldean"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+msgstr "Sartu berri diren kontaktuez notifikatuko dizu Gajim-ek popup bidez"
 
 #: ../src/gtkgui.glade.h:142
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Sartu berri diren kontaktuez notifikatuko dizu Gajim-ek popup bidez"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+msgstr ""
+"Deskonektatu diren kontaktuez Gajim-ek notifikatuko dizu popup bidez "
+"pantailako beheko eskubiko aldean"
 
 #: ../src/gtkgui.glade.h:143
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Deskonektatu diren kontaktuez Gajim-ek notifikatuko dizu popup bidez pantailako beheko eskubiko aldean"
+msgid ""
+"Gajim will only change the icon of the contact that sent the new message"
+msgstr ""
+"Gajim-ek bakarrik kontaktuaren ikonoa mezu berri bat dagoenean aldatzen du"
 
 #: ../src/gtkgui.glade.h:144
-msgid "Gajim will only change the icon of the contact that sent the new message"
-msgstr "Gajim-ek bakarrik kontaktuaren ikonoa mezu berri bat dagoenean aldatzen du"
-
-#: ../src/gtkgui.glade.h:145
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontu sortzailearen wizard-a"
 
-#: ../src/gtkgui.glade.h:146
-#: ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Generala"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Eman izena:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Taldea:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP konektatua"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Online laguntza"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Leihoa ezkutatu"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Web pertsonala:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Hostname: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Dagoeneko badut kontu bat erabiltzeko"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Kontu berri bat _erregistratu nahi dut"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Nire kontaktu listara nahi zaitut sartu."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "If checked, Gajim will also have a trayicon"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
-msgstr "Hautatua badago, Gajim-ek zerrendan kontaktuen abatereak azalaraziko ditu"
+msgstr ""
+"Hautatua badago, Gajim-ek zerrendan kontaktuen abatereak azalaraziko ditu"
 
-#: ../src/gtkgui.glade.h:161
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window"
-msgstr "Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen azpian."
+#: ../src/gtkgui.glade.h:159
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window"
+msgstr ""
+"Hautatua badago, Gajim-ek egoera mezua zerrendan erakutsaraziko du izenen "
+"azpian."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Hautatua badago, Gajim-ek  txat talde honetan sartuko da abiaraztean"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Hautatua badago, Gajim-ek kontu honen pasahitza gogoraraziko du"
 
+#: ../src/gtkgui.glade.h:162
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
+msgstr ""
+"Hautatua badago, Gajim-ek abiarazten duzun hurrengoan zerrenda gogoraraziko "
+"du eta txateko leihoaren posizioa eta tamaina pantailan ere"
+
+#: ../src/gtkgui.glade.h:163
+msgid ""
+"If checked, Gajim will replace ascii smilies like ':)' with equivalent "
+"graphical emoticons"
+msgstr ""
+"Hautatua badago, Gajim-ek  ´:)´ ascii hauek bere irudi grafikoaz eraldatuko "
+"ditu"
+
 #: ../src/gtkgui.glade.h:164
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "Hautatua badago, Gajim-ek abiarazten duzun hurrengoan zerrenda gogoraraziko du eta txateko leihoaren posizioa eta tamaina pantailan ere"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr ""
+"Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa "
+"gerta ez dadin."
 
 #: ../src/gtkgui.glade.h:165
-msgid "If checked, Gajim will replace ascii smilies like ':)' with equivalent graphical emoticons"
-msgstr "Hautatua badago, Gajim-ek  ´:)´ ascii hauek bere irudi grafikoaz eraldatuko ditu"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu "
+"irakurtzeko baimena zuk bakarrik izanik"
 
 #: ../src/gtkgui.glade.h:166
-msgid "If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection"
-msgstr "Hautatua badago, Gajim-ek keep-alive paketeak bidaliko ditu deskonexioa gerta ez dadin."
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko "
+"ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak "
+"jarriko dira.)"
 
 #: ../src/gtkgui.glade.h:167
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "Hautatua badago, Gajim-ek pasahitzak  ~/.gajim/config gordeko ditu irakurtzeko baimena zuk bakarrik izanik"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Hautatua badago, abiaraztean, automatikoki jabberrera konektatuko da kontu "
+"hau erabiliz"
 
 #: ../src/gtkgui.glade.h:168
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "Hautatua badago, Gajim-ek protokolo bakoitzaren egoera ikurrak irabiliko ditu (Adibidez: MSN bada, protokolo honek erabiltzen dituen berezko ikurrak jarriko dira.)"
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
 
 #: ../src/gtkgui.glade.h:169
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Hautatua badago, abiaraztean, automatikoki jabberrera konektatuko da kontu hau erabiliz"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek "
+"kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan."
 
 #: ../src/gtkgui.glade.h:170
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-
-#: ../src/gtkgui.glade.h:171
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Bi kontu edo gehiago badituzu eta aukera hau hautatua badago, Gajim-ek kontaktu guztiak kontu bat izango bazenu bezala jarriko lituzke zerrendan."
-
-#: ../src/gtkgui.glade.h:172
 msgid "Incoming message:"
 msgstr "Sarrerako mezua:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Informatu/Galdetu"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Zuri buzuzko informazioa zerbitzarian gordea dago"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Gonbidapena jasoa"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Italic"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Txat taldean _Sartu"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Kokapena"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Kontuak moldatu"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Talde agenda moldatu"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Emoticonoak moldatu"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Proxy profila moldatu"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Moldatu..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Izen erdia:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_deratzailea"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Gehiago"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Nick-a:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Inor ez"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Notifikatu kontaktuek hau egitean: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Mezu _guztietan"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Bidali mezua eta itxi leihoa"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Ireki..."
 
-#: ../src/gtkgui.glade.h:201
-#: ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Ireki OpenPGP enkriptazioa"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Edo ezarritako egoera mezu bat aukeratu:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Kanpoan nagoeneko mezua:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "Pasa_hitza:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Pasahitza:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Informazio pertsonala "
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefono zenbakia:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Soinuak _entzun"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Portua: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Tokia:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Posta kodea:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Preferentziak"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Aurreizkia:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Imprimatu ordua:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Lehentas_una:"
 
-#: ../src/gtkgui.glade.h:218
-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 "Jabber-en lehentasuna bi bezero edo gehiago konektatuta daudenean kontu berdinarekin zeinek jaso behar duen informazioa determinatzen du; Lehentasun handiena duen bezeroak jasotzen ditu mezuak."
+#: ../src/gtkgui.glade.h:222
+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 ""
+"Jabber-en lehentasuna bi bezero edo gehiago konektatuta daudenean kontu "
+"berdinarekin zeinek jaso behar duen informazioa determinatzen du; Lehentasun "
+"handiena duen bezeroak jasotzen ditu mezuak."
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profila, Abatareak"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokoloa:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Query Builder..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Berriki:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Erregistratu honetara"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Ezabatu k_ontua Gajim-etik bakarrik"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Ezabatu kontua Gajim-etik eta baita _zerbitzaritik"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Listatik fitxero tranferentzia ezabatu."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Ezabatu fitxero transferentzia hautatua"
+msgstr ""
+"Ezabatu  kantzelatuak, osorik eta huts egin dutenak  fitxero transferentzia "
+"zerrendatik"
 
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Erantzun mezu honi"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Berezko koloreak ezarri"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Baliabid_ea: "
 
-#: ../src/gtkgui.glade.h:233
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "Baliabidea Jabber-eko serbidorera bidaltzen da JID berdineko eta serbidore berdinera konektatutako kontua bi zati deberdinetan edo gehiagotan banatzeko asmoarekin. Hau horrela dabil: kontu bat  `Lana` baliabidearen jarrita eta kontu berdera `etxea` baliadidearekin jarria baduzu, mezua prioritate handiaena duenera bidaliko da. (Behean ikusi) "
+#: ../src/gtkgui.glade.h:236
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"Baliabidea Jabber-eko serbidorera bidaltzen da JID berdineko eta serbidore "
+"berdinera konektatutako kontua bi zati deberdinetan edo gehiagotan banatzeko "
+"asmoarekin. Hau horrela dabil: kontu bat  `Lana` baliabidearen jarrita eta "
+"kontu berdera `etxea` baliadidearekin jarria baduzu, mezua prioritate "
+"handiaena duenera bidaliko da. (Behean ikusi) "
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Baliabidea:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Eginkizuna:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Gelaren konfigurazioa"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Gela:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Gorde _pasa-esaldia(ez trinkoa)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Gorde _posizioa eta tamaina zerrendarena eta txateko leihoarena"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "_Gorde kontu guztien elkarrizketak"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Gorde pasa_hitza"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Search"
 msgstr "Bilatu"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Bidali"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Bidali fitxeroa"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Bidali mezu _bakarra"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Bidali _fitxeroa"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Mezu _berri bat bidali ..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Bidali keep-alive paketeak"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Bidali mezua"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Bidali mezua eta itxi leihoa"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 msgid "Sends a message to currently connected users to this server"
-msgstr "Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
+msgstr ""
+"Bidali mezu bat zerbitzari honetara orain konektatuta dauden kontaktuei"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Zerbitzaria:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Zerbitzariaren ezaugarriak:"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Ezarri MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Ezarri eguneko mezua"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Ezarri _Abatereak"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Ezarri abatere bat konektatzean"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Ezarri eguneko mezua"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Erakutsi pendiente dauden _gertaerak"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Ikusi _deskonektatutako kontaktuak"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Ikusi _zerrenda"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "_XML konsola ikusarazi"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Ikusi _zerrendan bakarrik"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr "Erakutsi zu eta beste baten arteko fitxero transferentzia"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Konektatua"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Deskonektatua"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Sailkatu kontaktuak egoeraren bidez"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "E_goera"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Txat elkarrizketa _hasi"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Egoera:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Egoera"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Egoera mezua:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Egoera:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Gelditu hautatutako fitxero transferentzia"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Kalea:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Gaia:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Harpidetza eskaria"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Harpidetza:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Atzezkia:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Egoera globalarekin sinkro_nizatu kontaktuen egoera"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Testuaren _kolorea:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Testu _mota:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Automatikoki kanpoko egoera mezua"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Automatikoki ez erabilgarriko egoera mezua"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Gaia:"
 
-#: ../src/gtkgui.glade.h:287
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-msgstr "Aukera honek fitxero transferentzia bakar bat kantzelatzen du. Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
+#: ../src/gtkgui.glade.h:289
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+msgstr ""
+"Aukera honek fitxero transferentzia bakar bat kantzelatzen du. "
+"Transferentzia martxan badago, lehenik gelditu egingo da eta ondoren ezabatu."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Izenburua:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Norentzat:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Toggle Open_PGP Encryption"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Sar ezazu zure egoera mezu berria:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Mota:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr "URL:"
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Azpimarratu"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "MOTD gaurkotu"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Eguneko mezua gaurkotu"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Eguneko mezua gaurkotu"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Erabili _SSL(Legacy)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Emoticon-ak erabili"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Erabili _transporteen ikurrak"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Erabili txat leiho bakarra _tab-arekin"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Erabili autentifikazioa"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Erabili bezeroaren hostname/portua"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Erabiltzailearen ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Fitxero transferentzia bukatzean erakutsi popup notifikazio bat"
 
-#: ../src/gtkgui.glade.h:306
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. NOTE: New message events only occur if it is a new message from a contact you are not already chatting with"
-msgstr "Gertaera berri bat (mezu bat, fitxero trasferentzia eskaera...) jasotzean, metodo honekin horiei buruz jakinarazteko balio dizu. OHARRA: Mezu berri baten jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona batekin izan ezik izango da."
-
 #: ../src/gtkgui.glade.h:307
+msgid ""
+"When a new event (message, file transfer request etc..) is received, the "
+"following methods may be used to inform you about it. NOTE: New message "
+"events only occur if it is a new message from a contact you are not already "
+"chatting with"
+msgstr ""
+"Gertaera berri bat (mezu bat, fitxero trasferentzia eskaera...) jasotzean, "
+"metodo honekin horiei buruz jakinarazteko balio dizu. OHARRA: Mezu berri "
+"baten jakinaraztea, bakarrik, dagoeneko hitz egiten ari zaren pertsona "
+"batekin izan ezik izango da."
+
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Ekintza berri bat jasotzean."
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Lana"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2781,371 +3036,370 @@ msgstr ""
 "Kontu bat behar duzu\n"
 "Jabber sarera konektatzeko"
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Zure JID-a:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Aukerak"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Kontaktua gehitu..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Zerrendara sartu"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Helbidea:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administratzailea"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Aurreratua"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizatu"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "A_tzealdeko kolorea:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Debekatu"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "_Talde agendan sartu gela hau"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Bilatu:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_kantzelatu"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Bista trikoa        Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Edukiak"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiatu JID/Email-a"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Link kokapena kopiatu"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Ukatu"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Zerbitzuak aurkitu"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Zerbitzuak aurkitu..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtroa:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "Txat _taldea"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IG"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icon in systray (aka. notification area)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "Gela berrian _sartu..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Bota"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "Elkarrizketaren _historiala"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "Kontaktuen egoera aldaketen _log-a "
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Email bezeroa"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Partaidea"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Batu kontuak"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Mezua"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Eraldatu"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "Kontua _editatu"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Izena "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Inoiz"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Notifikatu niri horri buruz"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifikatu fitxeroa transferitu denean"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Bete beharreko aukerak"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Konektatutako jendea"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Ireki email konposatzailea"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "Web-ean _ireki link-a"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Jabea"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Pasahitza:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Eten"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Entzun"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Pop it up"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Portua:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Preferentziak"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Presentzia"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Argitaratu"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Atera"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Borratu"
 
-#: ../src/gtkgui.glade.h:380
-#: ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Zerrendatik ezabatua"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Berrrizenpetu"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Erantzun"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Berridatzi"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Bilatu"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Bidali"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Bidali eta itxi"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Bidali mezu pribatu bat"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Bidali zerbitzariari mezua"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Bidali mezu bakarra"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Zerbitzaria"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Ezarri irudia"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "Txat-a _hasi"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Egoera"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Harpidetu"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Harpidetza"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Proxy erabili"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Izena"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Ahotsa"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML konsola..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "fitxeroen transferentziaren lista"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutu"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:105
-#: ../src/gtkgui_helpers.py:120
+#: ../src/gtkgui_helpers.py:105 ../src/gtkgui_helpers.py:120
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "Errorea: ezin da %s ireki irakurtzeko"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Errorea fitxeroa irakurtzean:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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."
+msgstr ""
+"ezin izan da  %s-ri idatzi. Sesio administratzailea euskarria ez dago lanean."
 
 #: ../src/history_window.py:94
 msgid "Date"
@@ -3155,8 +3409,7 @@ msgstr "Data"
 msgid "Message"
 msgstr "Mezua"
 
-#: ../src/history_window.py:111
-#: ../src/history_window.py:113
+#: ../src/history_window.py:111 ../src/history_window.py:113
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Elkarrizketa historiala %s-rekin"
@@ -3181,383 +3434,357 @@ msgstr "Egoera orain da: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Egoera orain da: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Aldatu %s -ra"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s mezu berri bat bidali dizu."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s fitxero bat bidali nahi dizu"
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, 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/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
-msgstr "%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
+msgstr ""
+"%(name)s -eko %(filename)s -ren fitxero trasferentzia gelditua izan da."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Jadanik bidalia izan da %(filename)s   %(name)s -ri."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Fitxero transferentzia %(filename)s -rena %(name)s -entzat gelditua."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Batu kontuak"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Zerbitzaria"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/roster_window.py:333
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "Gela berrian _sartu"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Talde agenda moldatu..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "%s kontura"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "%s kontua erabiliz"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "%s konturako"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "\"%s\" transportea ezabatu da"
 
-#: ../src/roster_window.py:844
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
-msgstr "You will no longer be able to send and receive messages to contacts from this transport."
+#: ../src/roster_window.py:859
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
+msgstr ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP kode bat izendatu"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Kode bat aukeratu kontuari ezartzeko"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Nire zerrendara nahi nizuke sartu"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "_Berrizenpetu"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Log aktibatua"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "Log_desaktibatua"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:1421
-msgid "By removing this contact you also by default 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:1440
+msgid ""
+"By removing this contact you also by default 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia behar da"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Gorde pasa-esaldia"
 
-#: ../src/roster_window.py:1549
-#: ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:1550
-#: ../src/roster_window.py:1610
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
-msgstr "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
+msgid ""
+"Changing your status to invisible will result in disconnection from those "
+"group chats. Are you sure you want to go invisible?"
+msgstr ""
+"Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
+"honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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."
+msgstr ""
+"Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:1963
-#: ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:1964
-#: ../src/roster_window.py:1970
-msgid "Messages will only be available for reading them later if you have history enabled."
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
+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:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Egoera Mezua Aldatu..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182
-#: ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "kontua erabiliz"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Ezkutatu menu hau"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s-ak ez du trasmititu OpenPGP kode bat ez behintzat zuk jarritakorik"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401
-#: ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "\"%s\" -tik mezu berri bat jaso duzu"
-
-#: ../src/tabbed_chat_window.py:402
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "Leiho hau isten baduzu eta ez baduzu historiala aktibatua mezu hau galduko duzu."
-
-#: ../src/tabbed_chat_window.py:458
-msgid "If you close this tab and you have history disabled, the message will be lost."
-msgstr "Leiho hau isten baduzu eta historiala ez baduzu aktibatua, mezua galdu egingo da."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Mezu pribatua bidaltzeak huts egin du"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Ez zaude gela honetan \"%s\" edo \"%s\" joan da."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Enkriptazioa aktibatuta"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Enkriptazioa desaktibatuta"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300
-#: ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Egikizun: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Afizioak: "
 
-#: ../src/tooltips.py:336
-#: ../src/tooltips.py:431
-#: ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Egoera: "
 
-#: ../src/tooltips.py:346
-#: ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Baliabideak: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Harpidetza: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Mota: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Deskargatu"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Kargatu"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Tamaina: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Transferitua:"
 
-#: ../src/tooltips.py:512
-#: ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Hasigabea"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Gelditua"
 
-#: ../src/tooltips.py:518
-#: ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Osatua"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Etena"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Stalled"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Tranferitzen"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Zerbitzu honek ez du oraindik erantzun informazio detailatuz."
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3571,58 +3798,69 @@ msgstr "Aukeratu abatereak"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "\"%s\" irudiaren tamaina handiegia da"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Fitxategiak ez du 32 kilobytes baino gehiago izan behar."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:292
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
-msgstr "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude haren egoera informazioan interesatuta"
+#: ../src/vcard.py:289
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
+msgstr ""
+"Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
+"haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:294
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
-msgstr "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan interesik"
+#: ../src/vcard.py:291
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
+msgstr ""
+"Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
+"interesik"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
-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:295
+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:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
-msgstr "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
+msgstr ""
+"Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:319
-#: ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " errekurtsoa lehentasunarekin "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 msgid "Personal details"
 msgstr "Informazio pertsonala"
 
@@ -3630,28 +3868,26 @@ msgstr "Informazio pertsonala"
 msgid "creating logs database"
 msgstr "logs-en datu basea sortzen"
 
-#: ../src/common/check_paths.py:79
-#: ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s fitxero bat da baina direktorio bat izan daiteke"
 
-#: ../src/common/check_paths.py:80
-#: ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim orain badago"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88
-#: ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "%s direktorioa sortzen"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s direktorio bat da baina fitxero bat izan daiteke"
@@ -3662,263 +3898,344 @@ msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
 
 #: ../src/common/exceptions.py:43
 msgid "Service not available: Gajim is not running, or remote_control is False"
-msgstr "Zerbitzua ez erabilgarri: Gajim ez dago abiarazita edota remote_control False egoeran dago"
+msgstr ""
+"Zerbitzua ez erabilgarri: Gajim ez dago abiarazita edota remote_control "
+"False egoeran dago"
 
 #: ../src/common/exceptions.py:51
 msgid "D-Bus is not present on this machine or python module is missing"
-msgstr "D-bus ez dago ordenagailu honetan edo python moduloak ez daude erabilgarri"
+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"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Erabili DBus eta Notification-Daemon jakinarazketak erakusteko."
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Ordua minutuetan, zure egoera kanpoan aldatu ondoren."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Kanpoan beste zerbaitetan egoteagatik"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Ez erabilgarri beste zerbaitetan egoteagatik"
 
-#: ../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:92
+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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Sartu * eta [n] zerrendako izenburuan?"
 
-#: ../src/common/config.py:126
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+#: ../src/common/config.py:134
+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:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
-msgstr "Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren azkenetik."
+msgstr ""
+"Zenbat minutu izan behar ditu azken lerroak  lehengo elkarrizketaren "
+"azkenetik."
 
-#: ../src/common/config.py:128
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
-msgstr "Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis ICQ Client default behaviour)."
+#: ../src/common/config.py:136
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
+msgstr ""
+"Bidali mezua Ctrl+Enter -rekin eta Enter-ekin lerro berria egin. (Mirabilis "
+"ICQ Client default behaviour)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Erabili modu konpaktua txat leiho bat irikitzean"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr "Erabili bista konpaktua txat talde leiho bat irikitzean."
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Hautatua badago, Gajim gajim-remote erabiliz kontrolatu daiteke."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Galdetu leiho bat itxi baino lehen."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
-msgstr "Overrides the host we send for File Transfer in case of address translation/port forwarding."
+#: ../src/common/config.py:154
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
+msgstr ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Erakutsi tab-a bakarrik elkarrizketa bat dagoenean?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Show tab border if one conversation?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Isteko botoila erakutsi tab-ean?"
 
-#: ../src/common/config.py:162
-msgid "A semicolon-separated list of words that will be highlighted in multi-user chat."
-msgstr "A semicolon-separated list of words that will be highlighted in multi-user chat."
+#: ../src/common/config.py:173
+msgid ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
+msgstr ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
 
-#: ../src/common/config.py:163
-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 "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:174
+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 ""
+"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:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Egia bada, Gajim-ek erregistratuko du xmpp:/ abiaraztean."
 
-#: ../src/common/config.py:165
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-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:176
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+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:166
-msgid "If True, Gajim will display the status message, if not empty, for every contact under the contact name in roster window"
-msgstr "Egia bada, Gjim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan kontaktuaren izenaren azpian azalduko dira."
+#: ../src/common/config.py:177
+msgid ""
+"If True, Gajim will display the status message, if not empty, for every "
+"contact under the contact name in roster window"
+msgstr ""
+"Egia bada, Gjim-ek egoera mezua azalaraziko du, hutsik ez badago, zerrendan "
+"kontaktuaren izenaren azpian azalduko dira."
+
+#: ../src/common/config.py:179
+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 ""
+"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."
 
-#: ../src/common/config.py:168
-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 "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."
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
+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 ""
+"Ezeztua bada, ez duzu egoera lerroa ikusiko kontaktu batek bere egoera "
+"aldaketa egiten duenean edota bere egoera mezua."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
-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 "Ezeztua bada, ez duzu egoera lerroa ikusiko kontaktu batek bere egoera aldaketa egiten duenean edota bere egoera mezua."
+#: ../src/common/config.py:186
+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 ""
+"Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak "
+"badira, make the window flash (the default behaviour in most Window "
+"Managers) when holding pending events."
 
-#: ../src/common/config.py:175
-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 "Hautatu badago eta GTK+ eta PyGTK bertsioak gutxienez 2.8 bertsiokoak badira, make the window flash (the default behaviour in most Window Managers) when holding pending events."
+#: ../src/common/config.py:188
+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 ""
+"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:177
-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 "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:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Lotan"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Laster etorriko naiz"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Minutu batzuk barru berriro hemen."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Jaten"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Jaten ari naiz, utzi mezu bat beraz."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Filmea"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Filma bat ikustean ari naiz."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Lanean"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Lanean ari naiz."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefonoa"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Telefonoan nago."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "kanpoan"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Kanpoan naiz bizitza disfrutatzen"
 
-#: ../src/common/config.py:349
-msgid "Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname."
-msgstr "Soinua bat entzun MUc-ak muc_highlight_words-eko hitz bat agertzean edota MUC-aren mezu batek zure nick-a duenean."
+#: ../src/common/config.py:367
+msgid ""
+"Sound to play when a MUC message contains one of the words in "
+"muc_highlight_words, or when a MUC message contains your nickname."
+msgstr ""
+"Soinua bat entzun MUc-ak muc_highlight_words-eko hitz bat agertzean edota "
+"MUC-aren mezu batek zure nick-a duenean."
 
-#: ../src/common/config.py:350
-msgid "Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)"
-msgstr "Soinu bat entzun MUC mezu bat jasotzean. (Aukera hau bakarrik kontuan hartzen da kontuaren notify_on_all_muc_messages True bada)"
+#: ../src/common/config.py:368
+msgid ""
+"Sound to play when any MUC message arrives. (This setting is taken into "
+"account only if notify_on_all_muc_messages is True)"
+msgstr ""
+"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:355
-#: ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "berdea"
 
-#: ../src/common/config.py:359
-#: ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "gizakia"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "arrantzale"
 
-#: ../src/common/config.py:371
-#: ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "plain"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Ezin da gela honetara sartu"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454
-#: ../src/common/connection.py:457
-#: ../src/common/connection.py:460
-#: ../src/common/connection.py:463
-#: ../src/common/connection.py:466
-#: ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Ezin da gela honetara sartu"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Pasahitza behar da gela onetan sartzeko."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Gela honetan ukatua izan zara."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Honako gela hau ez du esistitzen."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Gela sortzea mugatua dago."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Erregistratutako nick-a erabilia izan behar da."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Ez zaude kideen listan."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -3926,101 +4243,102 @@ msgstr ""
 "Zuk aukeratutako nick-a erregistratuta dago jadanik.\n"
 "Mesedez ezarri beste nick bat."
 
-#: ../src/common/connection.py:504
-#: ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s -ra harpidetuak gaude orain"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Harpidetza kentzekoa eskaera %s -tik"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s -ren harpidetzatik kenduta gaude"
 
-#: ../src/common/connection.py:550
-#: ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "\"%s\" kontuarekin konexioa galdu da"
 
-#: ../src/common/connection.py:551
-#: ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
+msgstr ""
+"Mezuak jasotzen eta bidaltzen jarraitzeko berriro konektatu beharko zara."
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1382
 #, 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"
+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"
 
-#: ../src/common/connection.py:1636
-#: ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Ezin izan da konektatu \"%s\" -rekin"
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "%s zerbitzarira konektatu: %s %s -ekin"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Begira ezazu zure konexioa edo saiatu berriro"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "\"%s\" -rekin autentifikazioak huts egin du"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP pasa-esaldia ez da eman"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "ikusezin"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "deskonektatua"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "%s naiz"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Mezu hau enkriptatua dago]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4029,17 +4347,16 @@ msgstr ""
 "Gaia: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Denbora bukatua"
 
-#: ../src/common/connection.py:2395
-#: ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Protokolo errore bat gertatu da:"
 
@@ -4161,10 +4478,6 @@ msgstr "Ikuse_zin"
 msgid "Invisible"
 msgstr "Ikusezin"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Zerrendan ez dago"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Ezin jakin"
@@ -4252,279 +4565,347 @@ 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:163
-#: ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "cyan"
 
-msgid "Cannot remove last group"
-msgstr "Ezin izan da ezabatu azken taldea"
+#~ msgid "account: "
+#~ msgstr "kontua: "
 
-msgid "At least one contact group must be present."
-msgstr "Gutxienez kontaktu talde bat egon behar da."
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Ziur al zaude \"%s\" geletatik atera nahi duzula?"
 
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install pysqlite3, if you want to migrate your logs to the new database, please read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
-msgstr "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install pysqlite3, if you want to migrate your logs to the new database, please read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Leiho hau isten baduzu, gela honetatik deskonektatuko zara."
 
-msgid "Image is too big"
-msgstr "Irudia handiegia da"
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Aktibatu/Desaktibatu fitxategi bat tranferitzen deneko notifikazioa"
 
-msgid "Image for emoticon has to be less than or equal to 24 pixels in width and 24 in height."
-msgstr "24x24 tamainako berdina edo gutxiagoko emoticon-ak jarri daitezke bakarrik."
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Ezabatu fitxero transferentzia hautatua"
 
-msgid "<b>Changes in latest version</b>"
-msgstr "<b>Aldaketak azken bertsioan</b>"
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Gelditu hautatutako fitxero transferentzia"
 
-msgid "Check for new _version on Gajim startup"
-msgstr "Begiratu bertsio b_erria Gajim abiaraztean"
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Erabili txat leiho bakarra _tab-arekin"
 
-msgid "Log history"
-msgstr "Historialaren log-a"
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Leiho hau isten baduzu eta historiala ez baduzu aktibatua, mezua galdu "
+#~ "egingo da."
 
-msgid "New version of Gajim available"
-msgstr "Gajim-en bertsio berri bat eskuragarri"
+#~ msgid "Cannot remove last group"
+#~ msgstr "Ezin izan da ezabatu azken taldea"
 
-msgid "Open Download Page"
-msgstr "Deskarga orria ireki"
+#~ msgid "At least one contact group must be present."
+#~ msgstr "Gutxienez kontaktu talde bat egon behar da."
 
-msgid "(%s/s)"
-msgstr "(%s/s)"
+#~ msgid ""
+#~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
+#~ "pysqlite3, if you want to migrate your logs to the new database, please "
+#~ "read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
+#~ msgstr ""
+#~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
+#~ "pysqlite3, if you want to migrate your logs to the new database, please "
+#~ "read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
 
-msgid "Do you want to migrate your logs?"
-msgstr "Zure log-ak eraldatu nahi al dituzu?"
+#~ msgid "Image is too big"
+#~ msgstr "Irudia handiegia da"
 
-msgid "It is the first time you run Gajim since the way logs are stored has changed. Gajim can migrate your logs at this state. Migrate?"
-msgstr "Hau da Gajim abiarazten duzun lehen aldia log-en artxibatzeko tokia aldatu zenetik. Gajim-ek zure log-ak eralda ditzake. Eraldatu?"
+#~ msgid ""
+#~ "Image for emoticon has to be less than or equal to 24 pixels in width and "
+#~ "24 in height."
+#~ msgstr ""
+#~ "24x24 tamainako berdina edo gutxiagoko emoticon-ak jarri daitezke "
+#~ "bakarrik."
 
-msgid "Dbus is not supported."
-msgstr "Dbus ez da onartzen"
+#~ msgid "<b>Changes in latest version</b>"
+#~ msgstr "<b>Aldaketak azken bertsioan</b>"
 
-msgid "Service not available"
-msgstr "Zerbitzua erabilezina"
+#~ msgid "Check for new _version on Gajim startup"
+#~ msgstr "Begiratu bertsio b_erria Gajim abiaraztean"
 
-msgid "Session bus is not available."
-msgstr "Bus sesioa ez dago erabilgarri."
+#~ msgid "Log history"
+#~ msgstr "Historialaren log-a"
 
-msgid "with account %s"
-msgstr "%s kontuarekin"
+#~ msgid "New version of Gajim available"
+#~ msgstr "Gajim-en bertsio berri bat eskuragarri"
 
-msgid "with account "
-msgstr "kontuarekin"
+#~ msgid "Open Download Page"
+#~ msgstr "Deskarga orria ireki"
 
-msgid "New Message as %s"
-msgstr "Mezu berria %s bezala"
+#~ msgid "(%s/s)"
+#~ msgstr "(%s/s)"
 
-msgid "Chat with"
-msgstr "Txateatu honekin"
+#~ msgid "Do you want to migrate your logs?"
+#~ msgstr "Zure log-ak eraldatu nahi al dituzu?"
 
-msgid "E-Mail"
-msgstr "E-Mail"
+#~ msgid ""
+#~ "It is the first time you run Gajim since the way logs are stored has "
+#~ "changed. Gajim can migrate your logs at this state. Migrate?"
+#~ msgstr ""
+#~ "Hau da Gajim abiarazten duzun lehen aldia log-en artxibatzeko tokia "
+#~ "aldatu zenetik. Gajim-ek zure log-ak eralda ditzake. Eraldatu?"
 
-msgid "Send New Message"
-msgstr "Mezu berri bat bidali"
+#~ msgid "Dbus is not supported."
+#~ msgstr "Dbus ez da onartzen"
 
-msgid "as %s"
-msgstr "%s kontua bezala"
+#~ msgid "Service not available"
+#~ msgstr "Zerbitzua erabilezina"
 
-msgid "as "
-msgstr "bezala "
+#~ msgid "Session bus is not available."
+#~ msgstr "Bus sesioa ez dago erabilgarri."
 
-msgid "Send _New Message"
-msgstr "Mezu _berri bat bidali"
+#~ msgid "with account %s"
+#~ msgstr "%s kontuarekin"
 
-msgid "Re_quest Authorization from"
-msgstr "Autor_izazio baimena kontu honetatik"
+#~ msgid "with account "
+#~ msgstr "kontuarekin"
 
-msgid "Send Authorization to"
-msgstr "Bidali autorizazioa honi"
+#~ msgid "New Message as %s"
+#~ msgstr "Mezu berria %s bezala"
 
-msgid "No such command: /%s"
-msgstr "No such command: /%s"
+#~ msgid "Chat with"
+#~ msgstr "Txateatu honekin"
 
-msgid "<b>Log</b>"
-msgstr "<b>Log-a</b>"
+#~ msgid "Send New Message"
+#~ msgstr "Mezu berri bat bidali"
 
-msgid "Log presences in _contact's log file"
-msgstr "Presentzien historiala _kontaktuen log-an"
+#~ msgid "as %s"
+#~ msgstr "%s kontua bezala"
 
-msgid "Log presences in an _external file"
-msgstr "Presentzien log-a _kanpo fitxero batean"
+#~ msgid "as "
+#~ msgstr "bezala "
 
-msgid "Unable to write file in %s"
-msgstr "Ezin da %s -ean idatzi"
+#~ msgid "Send _New Message"
+#~ msgstr "Mezu _berri bat bidali"
 
-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."
+#~ msgid "Re_quest Authorization from"
+#~ msgstr "Autor_izazio baimena kontu honetatik"
 
-msgid "Set value of 'key' to 'value'. If there is no such key, new item in the preferences is inserted."
-msgstr "Set value of 'key' to 'value'. If there is no such key, new item in the preferences is inserted."
+#~ msgid "Send Authorization to"
+#~ msgstr "Bidali autorizazioa honi"
 
-msgid "When a new message is received which is not from a contact already in a chat window, the three following actions may happen in order for you to be informed about it"
-msgstr "Mezu bat jasotzean eta ez dagoenean jadanik txat leihoan, jasotako azken hiru esaldiak azalduko zaizkizu informatu zaitezen."
+#~ msgid "No such command: /%s"
+#~ msgstr "No such command: /%s"
 
-msgid "_Earliest"
-msgstr "_Lehena"
+#~ msgid "<b>Log</b>"
+#~ msgstr "<b>Log-a</b>"
 
-msgid "_Latest"
-msgstr "_Azkena"
+#~ msgid "Log presences in _contact's log file"
+#~ msgstr "Presentzien historiala _kontaktuen log-an"
 
-msgid "_Previous"
-msgstr "_Aurrekoa"
+#~ msgid "Log presences in an _external file"
+#~ msgstr "Presentzien log-a _kanpo fitxero batean"
 
-msgid "Filter query too short"
-msgstr "Filter query too short"
+#~ msgid "Unable to write file in %s"
+#~ msgstr "Ezin da %s -ean idatzi"
 
-msgid "Query must be at least 3 characters long."
-msgstr "Galdera gutxienez 3 karakterekoa izan behar du."
+#~ 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."
 
-msgid "%s is now %s: %s"
-msgstr "%s orain %s da: %s"
+#~ msgid ""
+#~ "Set value of 'key' to 'value'. If there is no such key, new item in the "
+#~ "preferences is inserted."
+#~ msgstr ""
+#~ "Set value of 'key' to 'value'. If there is no such key, new item in the "
+#~ "preferences is inserted."
 
-msgid "Allow controlling Gajim via D-Bus service."
-msgstr "Baimendua Gajim erabiltzea D-Bus zerbitzuaren bidez."
+#~ msgid ""
+#~ "When a new message is received which is not from a contact already in a "
+#~ "chat window, the three following actions may happen in order for you to "
+#~ "be informed about it"
+#~ msgstr ""
+#~ "Mezu bat jasotzean eta ez dagoenean jadanik txat leihoan, jasotako azken "
+#~ "hiru esaldiak azalduko zaizkizu informatu zaitezen."
 
-msgid ""
-"\n"
-"\n"
-"\n"
-"== Original Message ==\n"
-"%s"
-msgstr ""
-"\n"
-"\n"
-"\n"
-"==Mezua originala==\n"
-"%s"
+#~ msgid "_Earliest"
+#~ msgstr "_Lehena"
 
-msgid ""
-"Your new account has been created successfully.\n"
-"You can set advanced account options by pressing Advanced button,\n"
-"or later by clicking in Accounts menuitem under Edit menu from the main window."
-msgstr ""
-"Kontua ondo erregistratu da.\n"
-"Aukera zehatzagoak eraldatu ditzakezu \"Editatu->kontua\" leihoan."
+#~ msgid "_Latest"
+#~ msgstr "_Azkena"
 
-msgid "Error:"
-msgstr "Errorea:"
+#~ msgid "_Previous"
+#~ msgstr "_Aurrekoa"
 
-msgid "error appeared while processing xmpp:"
-msgstr "errorea atera da xmpp prozesatzen ari zen bitartean"
+#~ msgid "Filter query too short"
+#~ msgstr "Filter query too short"
 
-msgid "Service Discovery using %s account"
-msgstr "Zerbitzaria aurkitua %s kontua erabiliz"
+#~ msgid "Query must be at least 3 characters long."
+#~ msgstr "Galdera gutxienez 3 karakterekoa izan behar du."
 
-msgid "Service"
-msgstr "Zerbitzua"
+#~ msgid "%s is now %s: %s"
+#~ msgstr "%s orain %s da: %s"
 
-msgid "Node"
-msgstr "Nodoa"
+#~ msgid "Allow controlling Gajim via D-Bus service."
+#~ msgstr "Baimendua Gajim erabiltzea D-Bus zerbitzuaren bidez."
 
-msgid ""
-"Your new account has been created and added to your gajim configuration.\n"
-"You can set advanced account options using \"Edit->Accounts\" in the main window menu."
-msgstr ""
-"Zure kontu berria sortu da eta gajim-eko konfigurazioan sartu da.\n"
-"Aukera zehatzagoak \"Editatu->kontua\" leihoan."
+#~ msgid ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "== Original Message ==\n"
+#~ "%s"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "\n"
+#~ "==Mezua originala==\n"
+#~ "%s"
 
-msgid "You need to enter a valid server address to add an account."
-msgstr "Zerbitzari baliagarri bat sartu behar duzu kontua sortzeko."
+#~ msgid ""
+#~ "Your new account has been created successfully.\n"
+#~ "You can set advanced account options by pressing Advanced button,\n"
+#~ "or later by clicking in Accounts menuitem under Edit menu from the main "
+#~ "window."
+#~ msgstr ""
+#~ "Kontua ondo erregistratu da.\n"
+#~ "Aukera zehatzagoak eraldatu ditzakezu \"Editatu->kontua\" leihoan."
 
-msgid "Contact names must be of the form \"user@servername\"."
-msgstr "Kontaktuaren izena horrela izan behar da \"izena@zerbitzaria\"."
+#~ msgid "Error:"
+#~ msgstr "Errorea:"
 
-msgid "Gajim - a GTK+ Jabber client"
-msgstr "Gajim - a GTK+ Jabber client"
+#~ msgid "error appeared while processing xmpp:"
+#~ msgstr "errorea atera da xmpp prozesatzen ari zen bitartean"
 
-msgid "Version %s"
-msgstr "%s bertsioa"
+#~ msgid "Service Discovery using %s account"
+#~ msgstr "Zerbitzaria aurkitua %s kontua erabiliz"
 
-msgid "Invalid contact ID"
-msgstr "ID kontaktu okerra"
+#~ msgid "Service"
+#~ msgstr "Zerbitzua"
 
-msgid "Contact ID must be of the form \"username@servername\"."
-msgstr "Kontaktuaren ID-a horrela jarri behar da \"izena@zerbitzria\"."
+#~ msgid "Node"
+#~ msgstr "Nodoa"
 
-msgid "Account registration successful"
-msgstr "Kontuaren erregistroa eginda"
+#~ msgid ""
+#~ "Your new account has been created and added to your gajim configuration.\n"
+#~ "You can set advanced account options using \"Edit->Accounts\" in the main "
+#~ "window menu."
+#~ msgstr ""
+#~ "Zure kontu berria sortu da eta gajim-eko konfigurazioan sartu da.\n"
+#~ "Aukera zehatzagoak \"Editatu->kontua\" leihoan."
 
-msgid "The account \"%s\" has been registered with the Jabber server."
-msgstr "\"%s\" kontua jabber zerbitzariarekin sortu da"
+#~ msgid "You need to enter a valid server address to add an account."
+#~ msgstr "Zerbitzari baliagarri bat sartu behar duzu kontua sortzeko."
 
-msgid "theme_name"
-msgstr "Gaiaren _izena"
+#~ msgid "Contact names must be of the form \"user@servername\"."
+#~ msgstr "Kontaktuaren izena horrela izan behar da \"izena@zerbitzaria\"."
 
-msgid "You just received a new message in room \"%s\""
-msgstr "Mezu berri bat jaso duzu \"%s\" gelan"
+#~ msgid "Gajim - a GTK+ Jabber client"
+#~ msgstr "Gajim - a GTK+ Jabber client"
 
-msgid "If you close this window and you have history disabled, this message will be lost."
-msgstr "Leiho hau isten baduzu eta historiala ez baduzu aktibatuta, mezu hau galdu egingo da"
+#~ msgid "Version %s"
+#~ msgstr "%s bertsioa"
 
-msgid "New _Room"
-msgstr "Gela B_erria"
+#~ msgid "Invalid contact ID"
+#~ msgstr "ID kontaktu okerra"
 
-msgid "Edit"
-msgstr "Editatu"
+#~ msgid "Contact ID must be of the form \"username@servername\"."
+#~ msgstr "Kontaktuaren ID-a horrela jarri behar da \"izena@zerbitzria\"."
 
-msgid "Account:"
-msgstr "Kontua:"
+#~ msgid "Account registration successful"
+#~ msgstr "Kontuaren erregistroa eginda"
 
-msgid "Always use compact _view"
-msgstr "Bista _trinkoa erabili beti"
+#~ msgid "The account \"%s\" has been registered with the Jabber server."
+#~ msgstr "\"%s\" kontua jabber zerbitzariarekin sortu da"
 
-msgid "Banner:"
-msgstr "Banner:"
+#~ msgid "theme_name"
+#~ msgstr "Gaiaren _izena"
 
-msgid "Cancels the selected file transfer. If there is an incomplete file, kept in the file system it will be removed. This operation is not reversable"
-msgstr "Hautatutako fitxero transferentzia kantzelatu. Osorik ez dagoen fitxero bat badago, Fitxeroa sistematik borratuko da. Aukera hau ez da itzulgarria."
+#~ msgid "You just received a new message in room \"%s\""
+#~ msgstr "Mezu berri bat jaso duzu \"%s\" gelan"
 
-msgid "Chan_ge"
-msgstr "Al_datu"
+#~ msgid ""
+#~ "If you close this window and you have history disabled, this message will "
+#~ "be lost."
+#~ msgstr ""
+#~ "Leiho hau isten baduzu eta historiala ez baduzu aktibatuta, mezu hau "
+#~ "galdu egingo da"
 
-msgid "Check if you want to register for a new jabber account"
-msgstr "Hautatu hau jabber kontu berri bat erregistratzeko"
+#~ msgid "New _Room"
+#~ msgstr "Gela B_erria"
 
-msgid "Click to get contact's extended information"
-msgstr "Sakatu kontaktuaren informazio zabalagoa lortzeko"
+#~ msgid "Edit"
+#~ msgstr "Editatu"
 
-msgid "Contact:"
-msgstr "Kontaktua:"
+#~ msgid "Account:"
+#~ msgstr "Kontua:"
 
-msgid "Enter your message:"
-msgstr "Sartu zure mezua:"
+#~ msgid "Always use compact _view"
+#~ msgstr "Bista _trinkoa erabili beti"
 
-msgid "If checked, all chat and group chat windows will have the information area in the top and the buttons area in the bottom hidden. You can quick toggle compact view with Alt+C. NOTE: The last state you leave a window/tab is not a permanent one"
-msgstr "If checked, all chat and group chat windows will have the information area in the top and the buttons area in the bottom hidden. You can quick toggle compact view with Alt+C. NOTE: The last state you leave a window/tab is not a permanent one"
+#~ msgid "Banner:"
+#~ msgstr "Banner:"
 
-msgid "Join _Group Chat..."
-msgstr "Txat taldean _Sartu..."
+#~ msgid ""
+#~ "Cancels the selected file transfer. If there is an incomplete file, kept "
+#~ "in the file system it will be removed. This operation is not reversable"
+#~ msgstr ""
+#~ "Hautatutako fitxero transferentzia kantzelatu. Osorik ez dagoen fitxero "
+#~ "bat badago, Fitxeroa sistematik borratuko da. Aukera hau ez da "
+#~ "itzulgarria."
 
-msgid "Please fill in the data for your existing account"
-msgstr "Mesedez bete dagoeneko daukazun kontuaren informazioa"
+#~ msgid "Chan_ge"
+#~ msgstr "Al_datu"
 
-msgid "Show roster window on Gajim startup"
-msgstr "Ikusi zerrenda leihoa Gajim abiaraztean"
+#~ msgid "Check if you want to register for a new jabber account"
+#~ msgstr "Hautatu hau jabber kontu berri bat erregistratzeko"
 
-msgid "_Compact View"
-msgstr "_Bista trinkoa"
+#~ msgid "Click to get contact's extended information"
+#~ msgstr "Sakatu kontaktuaren informazio zabalagoa lortzeko"
 
-msgid "_Join Group Chat"
-msgstr "_Sartu txat talde batean"
+#~ msgid "Contact:"
+#~ msgstr "Kontaktua:"
 
-msgid "_Nickname:"
-msgstr "_Nick-a:"
+#~ msgid "Enter your message:"
+#~ msgstr "Sartu zure mezua:"
 
-msgid "_Refresh"
-msgstr "_Garbitu"
+#~ msgid ""
+#~ "If checked, all chat and group chat windows will have the information "
+#~ "area in the top and the buttons area in the bottom hidden. You can quick "
+#~ "toggle compact view with Alt+C. NOTE: The last state you leave a window/"
+#~ "tab is not a permanent one"
+#~ msgstr ""
+#~ "If checked, all chat and group chat windows will have the information "
+#~ "area in the top and the buttons area in the bottom hidden. You can quick "
+#~ "toggle compact view with Alt+C. NOTE: The last state you leave a window/"
+#~ "tab is not a permanent one"
+
+#~ msgid "Join _Group Chat..."
+#~ msgstr "Txat taldean _Sartu..."
+
+#~ msgid "Please fill in the data for your existing account"
+#~ msgstr "Mesedez bete dagoeneko daukazun kontuaren informazioa"
+
+#~ msgid "Show roster window on Gajim startup"
+#~ msgstr "Ikusi zerrenda leihoa Gajim abiaraztean"
+
+#~ msgid "_Compact View"
+#~ msgstr "_Bista trinkoa"
+
+#~ msgid "_Join Group Chat"
+#~ msgstr "_Sartu txat talde batean"
+
+#~ msgid "_Nickname:"
+#~ msgstr "_Nick-a:"
 
-msgid "_Register new account"
-msgstr "_Erregistratu kontu berri bat"
+#~ msgid "_Refresh"
+#~ msgstr "_Garbitu"
 
-msgid "_Service Discovery"
-msgstr "_Zerbitzaria aurkitua"
+#~ msgid "_Register new account"
+#~ msgstr "_Erregistratu kontu berri bat"
 
-msgid "_Service Discovery..."
-msgstr "_Zerbiztaria aurkitua..."
+#~ msgid "_Service Discovery"
+#~ msgstr "_Zerbitzaria aurkitua"
 
-msgid "Unknown type %s "
-msgstr "Mota aurkitugabea %s "
+#~ msgid "_Service Discovery..."
+#~ msgstr "_Zerbiztaria aurkitua..."
 
+#~ msgid "Unknown type %s "
+#~ msgstr "Mota aurkitugabea %s "
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index b3ad370333d6615d4ab37ca253736e9ac4e5f743..b8b9f3635ba37c31bb09e4b287b9ac882cc5d19b 100644
--- a/po/fr/LC_MESSAGES/gajim.po
+++ b/po/fr/LC_MESSAGES/gajim.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-08 10:56+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: none\n"
@@ -25,9 +25,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Un client Jabber en GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -57,39 +56,8 @@ msgstr "(Aucune)"
 msgid "Hidden"
 msgstr "Éléments masqués"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Discussion"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Salons de Discussion"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "compte : "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "Absent de la liste"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Basculer vers %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -105,220 +73,375 @@ msgstr ""
 "\n"
 "La vérification orthographique ne sera pas utilisée"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Aucune connexion disponible"
+
+#: ../src/chat_control.py:302
+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é."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "Absent de la liste"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Discussion"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Encryption OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Encryption activée"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Encryption désactivée"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, 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:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
+"message sera perdu."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Toutes les %s _minutes"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Actif"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Événement"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Son"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "titre du message d'état"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "texte du message d'état :"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP n'est pas utilisable sur cet ordinateur"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Vous êtes actuellement connecté au serveur"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 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:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Nom de compte invalide"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Le nom du compte ne peut pas être vide."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Le nom du compte ne peut pas contenir d'espaces."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Identifiant Jabber invalide"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 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:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Entrée invalide"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Le port personnalisé doit être un numéro de port"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Compte non disponible"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Vous devez être connecté pour éditer vos informations."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Erreur en récupérant les clés secrètes"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Mot de passe"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Choisissez votre clé OpenPGP"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nom"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Serveur"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "_Éditer %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "S'enregistrer à %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Membre"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "P_ossesseur"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrateur"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Éjecter"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Fonction :"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Bannissement de %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Que voulez vous faire ?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Que voulez vous faire ?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Que voulez vous faire ?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrateur"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Que voulez vous faire ?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Texte"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Image"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Images"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nouveau Salon"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-page contient des données invalides"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Nom d'utilisateur non valide"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 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:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 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:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Compte ajouté avec succès"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -327,23 +450,23 @@ msgstr ""
 "Avancé, ou plus tard en cliquant sur Comptes dans le menu Éditer de la "
 "fenêtre principale."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Votre nouveau compte a été créé avec succès"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Une erreur est survenue lors de la création du compte"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Le nom du compte est utilisé"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Vous avez déjà un compte avec ce nom."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -351,49 +474,49 @@ msgstr ""
 "Le texte sous cette règle correspond à ce qui a été dit depuis la dernière "
 "fois que vous avez consulté ce salon de discussion"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Actions pour \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "Il manque un \"%s\" dans l'URL du dictionnaire et ce n'est pas WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dans l'URL de recherche sur Internet"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Hier"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "Il y a %i jours"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -420,12 +543,12 @@ msgstr "JID : <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Passerelles"
 
@@ -479,48 +602,71 @@ msgstr "Le contact est déjà dans votre liste."
 msgid "A GTK+ jabber client"
 msgstr "Un client Jabber en GTK+"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr ""
 "Traduction française proposée par\n"
 "Yann Le Boulanger <asterix@lagaule.org>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, 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:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Rejoindre un salon de discussion en tant que %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Rejoindre un salon de discussion"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Nom d'utilisateur non valide"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Commencer une discussion avec le compte %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "_Commencer une discussion"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -529,137 +675,154 @@ msgstr ""
 "envoyer un message"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connecté avec \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Vous devez entrer un mot de passe."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Les mots de passe tapés dans chaque champs doivent être identiques."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nouveau message"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nouveau message simple"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nouveau message privé"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "De la part de %s dans le salon %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Requête de transfert de fichier"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de Fichier"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Transfert de Fichier Terminé"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Transfert de Fichier Arrêté"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "À %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Message simple en tant que %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Message simple"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s a écrit :\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Vous avez été invité dans le salon %(room_jid)s par %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
@@ -706,11 +869,6 @@ msgstr "Ce type de service ne contient pas d'élément à parcourir."
 msgid "Browsing %s"
 msgstr "Parcourt %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Parcourir"
@@ -719,30 +877,30 @@ msgstr "_Parcourir"
 msgid "This service does not contain any items to browse."
 msgstr "Ce service ne contient aucun élément à parcourir."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Scanne %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Utilisateurs"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Description"
 
@@ -763,7 +921,7 @@ msgstr "Progression"
 msgid "Filename: %s"
 msgstr "Nom du Fichier : %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Taille : %s"
@@ -779,8 +937,8 @@ msgstr "Vous"
 msgid "Sender: %s"
 msgstr "Expéditeur : %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Destinataire : "
 
@@ -793,7 +951,7 @@ msgstr "sauvé dans : %s"
 msgid "File transfer completed"
 msgstr "Transfert de fichier terminé"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Ouvrir le répertoire de destination"
 
@@ -817,50 +975,55 @@ msgstr "Choisissez un fichier à envoyer..."
 msgid "Send"
 msgstr "Envoyer"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim ne peut accéder à ce fichier"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Ce fichier est utilisé par un autre processus."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Ce fichier existe déjà"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Que voulez vous faire ?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Fichier : %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Description : %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s souhaite vous envoyer un fichier :"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Enregistrer le Fichier sous..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Ce fichier existe déjà"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -868,37 +1031,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Fichier non valide"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Fichier : "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Il n'est pas possible d'envoyer un fichier vide"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Continuer"
 
@@ -1157,31 +1320,31 @@ msgstr ""
 "L'argument \"%s\" n'est pas précisé. \n"
 "Tappez \"%s help %s\" pour plus d'informations"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim a besoin d'un serveur X pour s'exécuter. Fermeture..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim a besoin de PyGTK 2.6+ pour s'exécuter."
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim a besoin de GTK 2.6+ pour s'exécuter."
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "La bibliothèque GTK+ ne contient pas le support de glade"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1190,83 +1353,83 @@ msgstr ""
 "Supprimez votre version actuelle de la bibliothèque GTK+ et installez la "
 "dernière version stable à partir de %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, 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:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorisation HTTP (%s) pour %s (id : %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "erreur en envoyant"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorisation acceptée"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Vous le verrez toujours déconnecté."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayez plus tard."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s est maintenant %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrect"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans clé OpenPGP."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "la vCard a été publiée avec succés"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Vos informations personnelles ont été publiées avec succès."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1276,36 +1439,36 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Impossible de sauver vos informations de configuration"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "L'historique a été corectement récupéré."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migration de l'historique..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Merci de patienter pendant la migration de l'historique..."
 
@@ -1327,149 +1490,99 @@ msgid "Please first choose another for your current theme."
 msgstr ""
 "Veuillez tout d'abord appliquer un autre thème avant de supprimer celui-ci."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Si vous fermer cette fenêtre, vous serez déconnecté de ces salons."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "L'envoi du message privé a échoué"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, 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_window.py:156
-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."
+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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Ne plus poser la question."
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Salons de Discussion"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Ce salon n'a pas de sujet"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s a été éjecté : %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s a été banni : %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Vous êtes désormais connu sous le nom de %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s est parti"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s est maintenant %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Changement de Sujet"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Saisissez le nouveau sujet :"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Changement de Surnom"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Marque-page déjà spécifié"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Le salon \"%s\" est déjà dans vos marque-pages."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Marque-page ajouté avec succès"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-"Vous pouvez gérer vos marque-pages par le menu Actions de votre liste de "
-"contacts."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Aucune connexion disponible"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-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/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Surnom introuvable : %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s semble ne pas être un JID valide"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Commandes : %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1482,7 +1595,7 @@ msgstr ""
 "actuellement dans le salon il sera également éjecté. Ne supporte pas les "
 "espaces dans le surnom."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1490,12 +1603,12 @@ msgstr ""
 "Usage : /%s <surnom>, ouvre une fenêtre de discussion privée avec l'occupant "
 "spécifié."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Usage : /%s, nettoie la fenêtre."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1504,12 +1617,12 @@ msgstr ""
 "Usage : /%s [raison], ferme la fenêtre ou l'onglet courrant en affichant la "
 "raison si spécifiée."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1518,7 +1631,7 @@ msgstr ""
 "Usage : /%s <JID> [raison], invite le JID dans le salon actuel, la raison "
 "est optionnelle."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1527,7 +1640,7 @@ msgstr ""
 "Usage : /%s <salon>@<serveur>[/surnom], propose de rejoindre salon@serveur "
 "en option on peut spécifier le surnom utilisé."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1538,7 +1651,7 @@ msgstr ""
 "spécifié du salon et affiche en option la raison. Le surnom ne doit pas "
 "contenir d'espaces !"
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1547,7 +1660,7 @@ msgstr ""
 "Usage : /%s <action>, envoie l'action au salon actuel. Utilise la troisième "
 "personne. (ex : /%s explose.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1556,40 +1669,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_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Usage : /%s <surnom>, change votre surnom dans ce salon."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Pas d'aide disponible pour /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Ne plus poser la question."
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Changement de Sujet"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Saisissez le nouveau sujet :"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Changement de Surnom"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Saisissez le nouveau surnom que vous souhaitez utiliser :"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Marque-page déjà spécifié"
+
+#: ../src/groupchat_control.py:1090
+#, 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:1100
+msgid "Bookmark has been added successfully"
+msgstr "Marque-page ajouté avec succès"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison ci-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
@@ -1748,42 +1910,38 @@ msgid "Accounts"
 msgstr "Comptes"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Active/Désactive la notification de fin de transfert"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Actions a_vancées"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Ajouter un nouveau contact"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Ajouter un _contact"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avancées"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Éditeur de configuration avancée"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Après le surnom :"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Après l'heure :"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1793,64 +1951,64 @@ msgstr ""
 "En train de composer seulement\n"
 "Aucun"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr ""
 "Autoriser l'envoi des informations concernant votre _système d'exploitation"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "L'autoriser à voir mon état"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Aussi appellé style iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Demander le message d'état lorsque je me : "
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Lui demander à voir son état"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Demande :"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Assigner une clé Open_PGP"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autoriser le contact à savoir quand vous êtes connecté"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Passer _absent après :"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Passer _indisponible après :"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Rejoindre automatiquement"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1862,72 +2020,72 @@ msgstr ""
 "Toujours utiliser les applications par défaut de KDE\n"
 "Personnalisé"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Autoriser automatiquement le contact à voir mon état"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Reconnexion automatique quand la connexion est perdue"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Avant le surnom :"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Avant l'heure :"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Anniversaire :"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Gras"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Créer une requête personnalisée"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "C_onnexion au démarrage"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Annule le transfert de fichier"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Annule le transfert du fichier sélectionné"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Annule le transfert du fichier sélectionné et supprime le fichier incomplet"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Chan_ger le mot de passe"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Changer le mot de passe"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Changer de sur_nom"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Changer le _sujet"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_fications d'état de discussion"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1937,7 +2095,7 @@ msgstr ""
 "vous spamme/ennuie. Utilisez la avec précaution, car elle bloque tous les "
 "messages des contacts qui ne sont pas dans votre liste"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1949,214 +2107,215 @@ msgstr ""
 "TLS par défaut si le serveur annonce qu'il le supporte, et avec cette option "
 "vous désactivez le TLS"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Choisissez une _clé"
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Ville :"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Nettoyer"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Cliquez pour changer le mot de passe du compte"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Cliquez pour insérer une frimousse Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Cliquez pour voir les fonctionnalités du serveur jabber (comme les "
 "passerelles MSN, ICQ)"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Cliquez ici pour voir les précédentes conversations de ce salon"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Cliquez ici pour voir les précédentes conversations avec ce contact"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Client :"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Entreprise :"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Configurer le _Salon"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Se connecter quand je clique sur Finir"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Connexion"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Informations"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Informations"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Historique de Conversation"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Pays :"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Icônes d'é_tat par défaut :"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Supprimer MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Supprimer le message du jour"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Supprime le message du jour"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Refuser"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Département :"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "_Afficher les avatars des contacts dans la fenêtre principale"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Afficher les messages d'état des contacts dans la fenêtre principale"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "Courriel :"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Éditer les groupes"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "_Éditer les informations personnelles..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Éditer les _groupes"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Gérer les frimousses"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Activer"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Entrez le de nouveau pour confirmer :"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Entrez un nouveau mot de passe :"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Événements"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Toutes les 5 _minutes"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Adresse 2 :"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Famille :"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transfert de fichiers"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Transfert de fichiers"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Gestionnaire de fichiers :"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtre :"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Style de la police :"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Police :"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Lui interdire de voir mon état"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format : AAAA-MM-JJ"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Foire Aux Questions (en ligne)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De :"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "Parc_ourir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalisation des thèmes de Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2164,7 +2323,7 @@ msgstr ""
 "Gajim peut envoyer et recevoir des meta-informations concernant les "
 "conversations que vous pouvez avoir avec un contact"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2172,7 +2331,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:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2180,7 +2339,7 @@ msgstr ""
 "Gajim vous signalera les nouveaux messages dans une fenêtre de notification "
 "en bas à droite de l'écran"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2188,7 +2347,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:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2196,74 +2355,74 @@ 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:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim ne fera que changer l'icône du contact qui a envoyé le nouveau message"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim : Assistant de création de compte"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Général"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Prénom :"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Groupe :"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Connexion HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Aide en ligne"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Cache la fenêtre"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Site perso :"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Serveur :"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "J'ai déjà un compte que je veux utiliser"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Je veux _créer un nouveau compte"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 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"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Si cette case est cochée, Gajim affichera l'avatar de chaque contact dans la "
 "fenêtre principale"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2271,16 +2430,16 @@ msgstr ""
 "Si cette case est cochée, Gajim affichera le message d'état, sous le nom de "
 "chaque contact dans la fenêtre principale"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Si cette case est cochée, Gajim se connectera à ce salon au démarrage"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 "Si cette case est cochée, Gajim va retenir le mot de passe pour ce compte"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2288,7 +2447,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va retenir la position de votre liste "
 "decontacts et des fenêtres de discussion pour vos prochaines utilisations"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2296,7 +2455,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va remplacer les frimousses ASCII comme « :) "
 "» par un équivalent graphique"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2304,7 +2463,7 @@ msgstr ""
 "Si coché, Gajim enverra des paquets de maintien de connexion pour prévenir "
 "des temps de latence pouvant entraîner des déconnexions"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2312,7 +2471,7 @@ msgstr ""
 "Si cette case est cochée, Gajim va sauvegarder le mot de passe dans ~/.gajim/"
 "config avec accès en lecture pour vous uniquement"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2322,7 +2481,7 @@ msgstr ""
 "protocoles. (Par ex. un contact MSN aura les icônes de MSN pour les états "
 "disponible, absent, occupé, etc)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2330,7 +2489,7 @@ msgstr ""
 "Si cette case est cochée, au démarrage, Gajim se connectera automatiquement "
 "à jabber en utilisant ce compte."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2340,7 +2499,7 @@ msgstr ""
 "l'aide du bouton en bas de la fenêtre principale) sera répercutée sur l'état "
 "de ce compte"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2348,167 +2507,180 @@ msgstr ""
 "Si vous avez 2 comptes ou plus et que cette case est cochée, Gajim va lister "
 "tous les contacts comme si vous n'aviez qu'un seul compte"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Message entrant :"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Information/Demande"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Les informations vous concernant, stockées sur le serveur"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Invitation reçue"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Italique"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Identifiant Jabber :"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Rejoindre un _salon de discussion"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Gérer les comptes"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Gérer les Marque-pages"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Gérer les frimousses"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Gérer les profils de proxys"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Modifier..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Second prénom :"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_dérateur"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Complément"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Surnom :"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Aucun"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Me Signaler quand un contact se : "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "Syst. d'exploit. :"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "À chaque _message"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Envoyer le message et fermer la fenêtre"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Ouvrir..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Encryption OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Ou choisissez votre message :"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Message sortant :"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Mot de passe : "
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Mot de passe :"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Informations personnelles"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Téléphone :"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Jouer les _sons"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port : "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Poste :"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Code postal :"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Préférences"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Titre :"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Afficher l'heure :"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priori_té :"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2518,64 +2690,60 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protocole :"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy :"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Construire une Requête..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Récemment :"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "S'enregistrer à"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Supprimer le compte de Gajim _uniquement"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Supprimer le compte de Gajim et du _serveur"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Supprimer le transfert de fichier de la liste."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Supprime le transfert du fichier sélectionné"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Repondre à ce message"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Utiliser les couleurs par défaut"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Ressour_ce: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2589,219 +2757,215 @@ msgstr ""
 "en même temps. La ressource avec la plus haute priorité recevra les messages "
 "(voir plus bas)."
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Ressource :"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Fonction :"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Configuration du salon de discussion"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Salon :"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Enregistrer votre mot de _passe (non sécurisé)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Garder l'_historique des conversations pour tous les contacts"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Enregistrer le mot de _passe"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Rechercher"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Envoyer"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Envoyer un Fichier"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Envoyer un _message simple"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Envoyer un _fichier"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Envoyer un _nouveau message..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Envoi des paquets de maintien de connexion"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Envoyer un message"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Envoyer le message et fermer la fenêtre"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Serveur :"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Fonctionalités des Serveurs"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Définir MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Définir un message du jour"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Choisir un _avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Définir un avatar à la connexion"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Mets un message du jour"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Montrer tous les _événements en attente"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Montrer les contacts déc_onnectés"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Montrer la _liste de contacts"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Montrer la console _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Ne montrer que dans la _liste"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_connecte"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_déconnecte"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Trier les contacts en fonction de leur état"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "É_tat"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Commencer une _discussion"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "État :"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "État"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Message d'état :"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "État :"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Arrête le transfert de fichier sélectionné"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Rue :"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Sujet :"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Requête d'Inscription"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Inscription :"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Suffixe :"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniser l'état du compte avec l'état global"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Couleur du texte :"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Police du texte :"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Le message automatique pour l'état \"absent\""
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Le message automatique pour l'état \"non disponible\""
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Thème :"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2809,81 +2973,77 @@ msgstr ""
 "Cette action supprime les transferts de fichier de la liste. Si le transfert "
 "est actif, il est d'abord arrêté puis supprimé"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "À :"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Bascule l'Encryption _GPG"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Taper votre nouveau message d'état :"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Type :"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Souligner"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Mettre à jour MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Mettre à jour le message du jour"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Mets à jour le message du jour"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Utiliser _SSL"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Utiliser les _frimousses"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Utiliser les icônes des pa_sserelles"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Utiliser l'authentification"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Utiliser un nom d'hôte/port personnalisé"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Identifiant :"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2895,15 +3055,15 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Quand un nouvel événement est reçu"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Emploi"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2911,346 +3071,346 @@ msgstr ""
 "Vous devez avoir un compte pour vous connecter\n"
 "au réseau Jabber."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Votre Identifiant Jabber :"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Actions"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Ajouter un Contact..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Ajouter à la liste de contacts"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adresse :"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrateur"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avancées"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autoriser"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Arrière-plan :"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Bannir"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Ajouter ce salon aux _Marque-pages"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Navigateur :"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "Vue _Compacte    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Sommaire"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Copier le JID/l'Adresse électronique"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Copier l'Adresse du Lien"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Refuser"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Découvrir les services..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtre :"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Salons de discussion"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historique"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icône dans la zone de notification"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 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:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "Re_joindre un nouveau salon..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Éjecter"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Historique de Conversation"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Inscrire dans l'historique les changements d'état des contacts"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "Logiciel de courriel :"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Membre"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Regrouper les comptes"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Message"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modifier"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Modifier le Compte..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Nom : "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Jamais"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "Me le _signaler"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "Me _signaler quand un transfert de fichier est terminé"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Pouvoirs du contact"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "Utilisateurs En _Ligne"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Ouvrir le logiciel de Courriel"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir le Lien dans votre navigateur"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "P_ossesseur"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "Mot de _passe : "
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Programme pour lire les sons :"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "L'_afficher"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port :"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Préférences"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Présence"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publier"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Quitter"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Supprimer"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Enlever de la liste de contacts"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Répondre"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Récupérer"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Rechercher"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "En_voyer"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Envoyer et Fermer"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Envoyer un message privé"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Envoyer un message au serveur"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Envoyer un message simple"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Serveur :"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Choisir une image..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Commencer une discussion"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "É_tat"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Ajouter"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Autorisation"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Utiliser un proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Nom :"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Voix"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "liste des transferts de fichier"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutes"
 
@@ -3260,17 +3420,17 @@ msgstr "minutes"
 msgid "Error: cannot open %s for reading"
 msgstr "Erreur : impossible d'ouvrir %s en lecture"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Erreur de lecture du fichier :"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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"
@@ -3308,95 +3468,105 @@ msgstr "L'état est maintenant : %(status)s : %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "L'état est maintenant : %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Basculer vers %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s vous a envoyé un nouveau message."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s souhaite vous envoyer un fichier."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, 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/notify.py:178
+#: ../src/notify.py:177
 #, 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/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Vous avez bien envoyé %(filename)s à %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, 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/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Comptes regroupés"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Serveur"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "Re_joindre un nouveau salon"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Gérer les Marque-pages..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "en utilisant le compte %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "en utilisant le compte %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "La passerelle \"%s\" sera enlevée"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3404,96 +3574,96 @@ msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de cette "
 "passerelle."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez une clé à assigner au contact"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Re_nommer"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Connecter"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, 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:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr ""
-"En supprimant ce contact, vous supprimez également son autorisation. Il "
-"vous verra donc toujours déconnecté."
+"En supprimant ce contact, vous supprimez également son autorisation. Il vous "
+"verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, 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:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3501,20 +3671,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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3522,184 +3692,137 @@ msgstr ""
 "Les messages seront disponibles à une lecture ultérieure si l'archivage de "
 "l'historique est actif."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Changer le message d'état..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "en utilisant le compte "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Cacher ce menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"%s n'a pas envoyé de clé OpenPGP et vous ne lui en avez pas assigné une"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Vous venez de recevoir un nouveau message de \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Si vous fermez cette fenêtre et que l'historique n'est pas activé, ce "
-"message sera perdu."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Si vous fermez cet onglet et que l'historique n'est pas activé, le message "
-"sera perdu."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "L'envoi du message privé a échoué"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Vous n'êtes plus dans le salon \"%s\" ou \"%s\" l'a quitté."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Encryption activée"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Encryption désactivée"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Fonction : "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Affiliation : "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Taille : "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Non commencé"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Arrêté"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Terminé"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Calé"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "En train de transférer"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 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:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3713,31 +3836,31 @@ msgstr "Choisissez un Avatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Le taille du fichier de l'image \"%s\" est trop importante"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Le fichier ne doit pas excéder les 32 kilobytes."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 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:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3745,12 +3868,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "votre"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3758,24 +3881,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:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Informations personnelles"
@@ -3784,25 +3907,26 @@ msgstr "Informations personnelles"
 msgid "creating logs database"
 msgstr "création de la base de donnée de l'historique"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s est un fichier mais devrait être un répertoire"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim va maintenant s'arrêter"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "crée le répertoire %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s est un répertoire mais devrait être un fichier"
@@ -3824,38 +3948,38 @@ msgstr "D-Bus n'est pas présent sur cette machine"
 msgid "Session bus is not available"
 msgstr "Le bus de session n'est pas disponible"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Utilise DBus et Notification-Daemon pour afficher les notifications"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Absent car inactif"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Non disponible car inactif"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Ajouter * et [n] au titre de la liste des contacts ?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3863,12 +3987,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:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3876,22 +4000,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3900,19 +4024,23 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 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:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3920,23 +4048,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:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Montrer l'onglet quand il n'y a qu'une discussion ?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Afficher le bouton fermer sur l'onglet ?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3944,7 +4072,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:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3953,11 +4081,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3965,7 +4093,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3973,7 +4101,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:168
+#: ../src/common/config.py:179
 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."
@@ -3981,8 +4109,8 @@ msgstr ""
 "Si vrai demandera son avatar à chaque contact qui n'en avait pas la fois "
 "précédente ou dont la version en cache a expiré."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3990,72 +4118,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Dors"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Travail"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Je suis dehors à profiter de la vie"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4063,7 +4206,7 @@ msgstr ""
 "Son à jouer lorsqu'un message de salon contient un des mots de "
 "muc_highlight_words, ou lorsqu'un message de salon contient votre surnom."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4072,61 +4215,66 @@ msgstr ""
 "pris en compte seulement si notify_on_all_muc_messages est vrai)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "Vert"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "épicerie"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "Humain"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "Marine"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "Standard"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Impossible de rejoindre le salon"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Un mot de passe est requis pour rejoindre ce salon."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Vous êtes banni de ce salon."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Ce salon n'existe pas."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "La création de salon est réservée aux administrateurs."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Vous devez utiliser le surnom donné lors de l'enregistrement."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Vous n'êtes pas dans la liste des membres."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4135,40 +4283,40 @@ msgstr ""
 "par un autre occupant.\n"
 "Veuillez entrer un autre surnom ci-dessous :"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nous sommes maintenant inscrits chez %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Requête de désinscription de la part de %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nous ne sommes plus dans la liste de %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "La connexion du compte \"%s\" a été perdue"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4178,61 +4326,61 @@ msgstr ""
 "de contact. Utiliser un outil de gestion de liste de contact tel que http://"
 "jru.jabberstudio.org/ pour le supprimer"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connecté au serveur %s:%s avec %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de passe OpenPGP non renseigné"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "invisible"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "Déconnecté"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Je suis %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4241,18 +4389,18 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Dépassement de temps"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Une erreur de protocole s'est produite :"
 
@@ -4374,10 +4522,6 @@ msgstr "_Invisible"
 msgid "Invisible"
 msgstr "Invisible"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Absent de la liste"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Inconnu"
@@ -4465,10 +4609,38 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "Cyan"
 
+#~ msgid "account: "
+#~ msgstr "compte : "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Êtes-vous sûr de vouloir quitter les salons \"%s\" ?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Si vous fermer cette fenêtre, vous serez déconnecté de ces salons."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Active/Désactive la notification de fin de transfert"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Supprime le transfert du fichier sélectionné"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Arrête le transfert de fichier sélectionné"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Utiliser une seule fenê_tre de discussion avec des onglets"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Si vous fermez cet onglet et que l'historique n'est pas activé, le "
+#~ "message sera perdu."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Impossible d'enlever le dernier groupe"
 
diff --git a/po/gajim.pot b/po/gajim.pot
index 2e6bfc98d0bcbef4080ff5a7fdc0a34edb57f3c5..ed96240153c752af030f9af8b848bc0e5d9dff0b 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,9 +22,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr ""
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr ""
 
@@ -54,329 +53,439 @@ msgstr ""
 msgid "Hidden"
 msgstr ""
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
+#. FIXME: add a ui for this use spell.set_language()
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
+msgid ""
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
 msgstr ""
 
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
 msgstr ""
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
 #: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
 msgid "Not in Roster"
 msgstr ""
 
-#: ../src/chat.py:555
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr ""
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr ""
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
 #, python-format
-msgid "Switch to %s"
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
 msgstr ""
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr ""
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr ""
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr ""
+
+#: ../src/chat_control.py:1189
 msgid ""
-"If that is not your language for which you want to highlight misspelled "
-"words, then please set your $LANG as appropriate. Eg. for French do export "
-"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
-"global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
+"If you close this tab and you have history disabled, this message will be "
+"lost."
 msgstr ""
 
-#: ../src/config.py:184 ../src/config.py:427
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr ""
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr ""
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr ""
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr ""
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr ""
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr ""
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr ""
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr ""
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr ""
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr ""
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr ""
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr ""
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr ""
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr ""
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr ""
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr ""
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr ""
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/config.py:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr ""
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr ""
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr ""
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr ""
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr ""
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr ""
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr ""
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr ""
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr ""
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+msgid "Member List"
+msgstr ""
+
+#: ../src/config.py:1878
+msgid "Owner List"
+msgstr ""
+
+#: ../src/config.py:1879
+msgid "Administrator List"
+msgstr ""
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr ""
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+msgid "Nick"
+msgstr ""
+
+#: ../src/config.py:1929
+msgid "Role"
+msgstr ""
+
+#: ../src/config.py:1950
+msgid "Banning..."
+msgstr ""
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr ""
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr ""
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr ""
+
+#: ../src/config.py:1960
+msgid "Adding Administrator..."
+msgstr ""
+
+#: ../src/config.py:1961
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr ""
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr ""
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr ""
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr ""
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr ""
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr ""
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr ""
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr ""
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr ""
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr ""
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr ""
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr ""
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr ""
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr ""
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr ""
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr ""
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr ""
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr ""
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr ""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr ""
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr ""
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr ""
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr ""
@@ -402,12 +511,12 @@ msgstr ""
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr ""
 
@@ -461,181 +570,220 @@ msgstr ""
 msgid "A GTK+ jabber client"
 msgstr ""
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr ""
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr ""
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr ""
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+msgid "Invalid room or server name"
+msgstr ""
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr ""
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 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:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr ""
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr ""
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr ""
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr ""
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr ""
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr ""
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr ""
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr ""
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr ""
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr ""
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr ""
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr ""
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr ""
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr ""
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr ""
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr ""
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr ""
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, python-format
 msgid "Received %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr ""
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -680,11 +828,6 @@ msgstr ""
 msgid "Browsing %s"
 msgstr ""
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr ""
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr ""
@@ -693,30 +836,30 @@ msgstr ""
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr ""
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr ""
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr ""
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr ""
 
@@ -737,7 +880,7 @@ msgstr ""
 msgid "Filename: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr ""
@@ -753,8 +896,8 @@ msgstr ""
 msgid "Sender: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr ""
 
@@ -767,7 +910,7 @@ msgstr ""
 msgid "File transfer completed"
 msgstr ""
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr ""
 
@@ -791,50 +934,54 @@ msgstr ""
 msgid "Send"
 msgstr ""
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr ""
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr ""
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr ""
+
+#: ../src/filetransfers_window.py:313
+msgid "What do you want to do?"
+msgstr ""
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr ""
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr ""
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr ""
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr ""
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -842,37 +989,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr ""
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr ""
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr ""
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr ""
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr ""
 
@@ -1112,113 +1259,113 @@ msgid ""
 "Type \"%s help %s\" for more info"
 msgstr ""
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr ""
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr ""
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr ""
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr ""
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr ""
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr ""
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr ""
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr ""
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr ""
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr ""
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr ""
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr ""
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr ""
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr ""
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr ""
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1226,34 +1373,34 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 msgid "GUI Migration failed"
 msgstr ""
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr ""
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr ""
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 
@@ -1274,146 +1421,98 @@ msgstr ""
 msgid "Please first choose another for your current theme."
 msgstr ""
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
 msgstr ""
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr ""
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/groupchat_window.py:160
-msgid "Do _not ask me again"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
 msgstr ""
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr ""
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr ""
 
 #. do not print 'banned by None'
-#: ../src/groupchat_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr ""
 
-#: ../src/groupchat_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr ""
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr ""
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr ""
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr ""
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr ""
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr ""
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr ""
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr ""
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr ""
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr ""
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr ""
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr ""
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 
-#: ../src/groupchat_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1422,44 +1521,44 @@ msgid ""
 "spaces in nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr ""
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr ""
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr ""
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1467,53 +1566,100 @@ msgid ""
 "nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
 "g. /%s explodes.)"
 msgstr ""
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 
-#: ../src/groupchat_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr ""
 
+#: ../src/groupchat_control.py:1022
+#, python-format
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr ""
+
+#: ../src/groupchat_control.py:1023
+msgid "If you close this window, you will be disconnected from this room."
+msgstr ""
+
+#: ../src/groupchat_control.py:1027
+#, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr ""
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr ""
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr ""
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr ""
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr ""
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr ""
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr ""
+
+#: ../src/groupchat_control.py:1101
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr ""
+
 #. ask for reason
-#: ../src/groupchat_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr ""
@@ -1663,103 +1809,99 @@ msgid "Accounts"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
 "Disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1767,78 +1909,78 @@ msgid ""
 "Custom"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
 "not in the roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1846,588 +1988,596 @@ msgid ""
 "be disabled"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 msgid "Emoticon set:"
 msgstr ""
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr ""
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr ""
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
 "etc...)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr ""
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr ""
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr ""
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:200
-msgid "Open..."
+#: ../src/gtkgui.glade.h:203
+msgid "One message _window:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
+#: ../src/gtkgui.glade.h:204
+msgid "Open..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr ""
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:229
-msgid "Removing selected file transfer"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2436,294 +2586,286 @@ msgid ""
 "has the highest priority will get the events. (see below)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 msgid "Search"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr ""
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:288
-msgid "Title:"
-msgstr ""
-
-#: ../src/gtkgui.glade.h:289
-msgid "To:"
-msgstr ""
-
 #: ../src/gtkgui.glade.h:290
-msgid "Toggle Open_PGP Encryption"
+msgid "Title:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:291
-msgid "Type your new status message:"
+msgid "To:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:292
-msgid "Type:"
+msgid "Toggle Open_PGP Encryption"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:293
-msgid "URL:"
+msgid "Type your new status message:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:294
-msgid "Underline"
+msgid "Type:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:295
-msgid "Update MOTD"
+msgid "URL:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:296
-msgid "Update Message of the Day"
+msgid "Underline"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:297
-msgid "Updates Message of the Day"
+msgid "Update MOTD"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:298
-msgid "Use _SSL (legacy)"
+msgid "Update Message of the Day"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:299
-msgid "Use _emoticons"
+msgid "Updates Message of the Day"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:300
-msgid "Use _transports iconsets"
+msgid "Use _SSL (legacy)"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
+msgid "Use _emoticons"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:302
-msgid "Use authentication"
+msgid "Use _transports iconsets"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:303
-msgid "Use custom hostname/port"
+msgid "Use authentication"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:304
-msgid "User ID:"
+msgid "Use custom hostname/port"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:305
-msgid "When a file transfer is complete show a popup notification"
+msgid "User ID:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:306
+msgid "When a file transfer is complete show a popup notification"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2731,360 +2873,360 @@ msgid ""
 "chatting with"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr ""
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr ""
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr ""
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr ""
 
@@ -3094,17 +3236,17 @@ msgstr ""
 msgid "Error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3142,381 +3284,348 @@ msgstr ""
 msgid "Status is now: %(status)s"
 msgstr ""
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr ""
+
+#: ../src/notify.py:145
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 msgstr ""
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr ""
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr ""
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr ""
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr ""
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+msgid "Observers"
+msgstr ""
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr ""
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr ""
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr ""
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr ""
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr ""
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr ""
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
 msgstr ""
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr ""
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr ""
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr ""
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr ""
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr ""
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 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:1422
+#: ../src/roster_window.py:1441
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr ""
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr ""
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr ""
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr ""
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr ""
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 
 #: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr ""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr ""
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr ""
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr ""
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr ""
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:285
+#: ../src/tooltips.py:284
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr ""
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr ""
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr ""
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr ""
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr ""
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr ""
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3528,63 +3637,63 @@ msgstr ""
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr ""
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr ""
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 msgid "Personal details"
 msgstr ""
 
@@ -3592,25 +3701,26 @@ msgstr ""
 msgid "creating logs database"
 msgstr ""
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr ""
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr ""
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr ""
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr ""
@@ -3631,391 +3741,414 @@ msgstr ""
 msgid "Session bus is not available"
 msgstr ""
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr ""
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr ""
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 
 #. which version created the config
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr ""
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr ""
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, 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:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 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:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 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:166
+#: ../src/common/config.py:177
 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:168
+#: ../src/common/config.py:179
 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: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr ""
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr ""
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr ""
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr ""
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr ""
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr ""
 
+#: ../src/common/connection.py:81
+msgid "Unable to load idle module"
+msgstr ""
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr ""
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr ""
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr ""
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 msgid "I would like to add you to my roster."
 msgstr ""
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr ""
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr ""
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr ""
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr ""
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1382
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 msgstr ""
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr ""
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr ""
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 msgid "Please check your login and password for correctness."
 msgstr ""
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr ""
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr ""
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr ""
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr ""
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr ""
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr ""
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4137,10 +4270,6 @@ msgstr ""
 msgid "Invisible"
 msgstr ""
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr ""
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr ""
@@ -4228,6 +4357,6 @@ msgstr ""
 msgid "error: cannot open %s for reading"
 msgstr ""
 
-#: ../src/common/optparser.py:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr ""
diff --git a/po/it/LC_MESSAGES/gajim.po b/po/it/LC_MESSAGES/gajim.po
index 50f7a7703794de0cb9ac10f2fdf5da0a88aba0df..0b6326d97431a1a9a0e2feb4f89d391c7d948304 100644
--- a/po/it/LC_MESSAGES/gajim.po
+++ b/po/it/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-19 17:49+0100\n"
 "Last-Translator: Matteo Dell'Amico <della@linux.it>\n"
 "Language-Team: Italian\n"
@@ -23,9 +23,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Un client Jabber GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -55,39 +54,8 @@ msgstr "(Nessuna)"
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Chat"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Chat di gruppo"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "account: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "non nel roster"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Cambiare in %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -103,223 +71,378 @@ msgstr ""
 "\n"
 "Non verrà usata la caratteristica di evidenziatura parole scorrette"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Nessuna connessione disponibile"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Il messaggio non può venire inviato finché non si è connessi."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "non nel roster"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Chat"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Cifratura OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, 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:986
+msgid "Encryption enabled"
+msgstr "Cifratura attivata"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Cifratura disattivata"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
+"messaggio verrà perso."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Ogni %s _minuti"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Attivo"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Suono"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "titolo del messaggio di stato"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "testo del messaggio di stato"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "Non è possibile usare OpenPGP su questo computer"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Si è ora connessi al server"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Per cambiare nome account, è necessario disconnettersi."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Il nome account non è valido"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Il nome account non può essere vuoto."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Il nome account non può contenere spazi."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "ID Jabber non valido"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Un ID Jabber deve essere nella forma \"utente@nomeserver\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Voce non valida"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Si deve scegliere un numero di porta."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Questo account non è disponibile"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Senza una connessione, non è possibile modificare le informazioni personali."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Fallimento nella ricezione delle chiavi segrete"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "C'è stato un problema nel recuperare le chiavi segrete OpenPGP."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Scegliere la chiave OpenPGP"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Nessuna chiave selezionata"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Modifica %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registra a %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Membro"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Proprietario"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Amministratore"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Caccia"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Ruolo:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Sto bandendo %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Cosa fare?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Cosa fare?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Cosa fare?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Amministratore"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Cosa fare?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Testo"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Immagine"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "L'account \"%s\" è connesso al server"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Se viene rimosso, la connessione verrà persa."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Memorizza password"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nuova stanza"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Questo segnalibro contiene dati non validi"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Nome utente non valido"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "È necessario inserire un nome utente per configurare questo account."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Password non valida"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "È necessario inserire una password per il nuovo account."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "L'account è stato aggiunto con successo"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -328,23 +451,23 @@ msgstr ""
 "\", o farlo più tardi cliccando alla voce \"Account\" nel menu \"Modifica\" "
 "della finestra principale."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Il nuovo account è stato creato con successo"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Si è verificato un errore durante la creazione dell'account"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Il nome account è già in uso"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Esiste già un account con lo stesso nome"
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -352,48 +475,48 @@ msgstr ""
 "Il testo sotto a questa riga è quanto è stato detto dall'ultima volta che si "
 "è prestata attenzione a questa chat di gruppo"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Azioni per \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Leggi l'articolo di _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Controlla nel _Dizionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Manca un \"%s\" nell'URL del Dizionario e questo non è WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Manca un \"%s\" nell'URL di ricerca su web"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Cercalo nel Web"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Ieri"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i giorni fa"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Oggetto: %s\n"
@@ -419,12 +542,12 @@ msgstr "JID : <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Trasporti"
 
@@ -478,47 +601,70 @@ msgstr "Questo contatto è già presente nel roster."
 msgid "A GTK+ jabber client"
 msgstr "Un client jabber GTK+"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 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:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Richiesta di abbonamento per l'account %s da %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Richiesta di abbonamento da %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entra in chat di gruppo con l'account %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Entrare in chat di gruppo"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Nome utente non valido"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Inizia chat con l'account %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Inizia chat"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -527,137 +673,155 @@ msgstr ""
 "mandare un messaggio di chat:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Connessione non disponibile"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Assicurarsi di essere connesso con \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Senza una connessione, non è possibile cambiare la password."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "È necessario inserire una password."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Le password non coincidono"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Le password immesse nei due campi devono essere identiche."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Contatto connesso"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Contatto disconnesso"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nuovo messaggio"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nuovo messaggio singolo"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nuovo messaggio privato"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Da %s nella stanza %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Da %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Richiesta di trasferimento file"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Errore nel trasferimento file"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Trasferimento file fermato"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "A %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "Ci sono messaggi non letti"
+msgstr[1] "Ci sono messaggi non letti"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Messaggio singolo con l'account %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Messaggio singolo"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Invia %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s ha scritto:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML per %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Sei stato invitato nella stanza %(room_jid)s da %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Commento: %s"
@@ -705,11 +869,6 @@ msgstr "Questo tipo di servizio non contiene oggetti da consultare."
 msgid "Browsing %s"
 msgstr "Consultazione %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Consulta"
@@ -718,30 +877,30 @@ msgstr "_Consulta"
 msgid "This service does not contain any items to browse."
 msgstr "Questo servizio non contiene oggetti da consultare."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Analisi %d / %d..."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Utenti"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Descrizione"
 
@@ -762,7 +921,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome file: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Dimensione: %s"
@@ -778,8 +937,8 @@ msgstr "Tu"
 msgid "Sender: %s"
 msgstr "Mittente: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Destinatario: "
 
@@ -792,7 +951,7 @@ msgstr "Memorizzato in: %s"
 msgid "File transfer completed"
 msgstr "Trasferimento file completato"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Apri cartella"
 
@@ -816,50 +975,55 @@ msgstr "Scegliere il file da inviare..."
 msgid "Send"
 msgstr "Invia"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim non riesce a leggere questo file"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Questo file è in uso da un altro processo."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Questo file esiste già"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Cosa fare?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "File: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Descrizione: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vuole inviarti un file:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Salva file come..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Questo file esiste già"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -867,37 +1031,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "File non valido"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "File: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Non è possibile inviare file vuoti"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Mittente: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Continua"
 
@@ -1162,32 +1326,32 @@ msgstr ""
 "Il parametro \"%s\" non è specificato. \n"
 "Scrivere\"%s help %s\" per maggiori informazioni"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim ha bisogno di un server X per essere eseguito. Uscita..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim ha bisogno di PyGTK 2.6 o superiore"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim ha bisogno di GTK2.6 o superiore"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Supporto libglade mancante nel runtime GTK+"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1196,83 +1360,83 @@ msgstr ""
 "Eliminare il runtime GTK+ corrente ed installare l'ultima versione stabile "
 "da %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 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:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorizzazione HTTP (%s) per %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Accettare questa richiesta?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "errore durante l'invio"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorizzazione accettata"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Il contatto \"%s\" ha eliminato il tuo abbonamento verso di lui"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Lo vedrai sempre come offline."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Non si può contattare \"%s\""
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Controllare la connessione o riprovare più tardi."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s è ora %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Passphrase errata"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Si è connessi senza la chiave OpenPGP"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "La vCard è stata pubblicata correttamente"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Le informazioni personali sono state pubblicate con successo."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1282,35 +1446,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "I log sono stati migrati con successo al database."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migrazione log..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Attendere durante la migrazione dei log..."
 
@@ -1331,146 +1495,98 @@ msgstr "Non è possibile eliminare il tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Scegliere prima un altro tema."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Chiudendo questa finestra, si verrà disconnessi da queste stanze."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Invio messaggio privato fallito"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Si è sicuri di voler uscire dalla stanza \"%s\"?"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Chiudendo questa finestra, si verrà disconnessi da questa stanza."
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
+msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
 
-#: ../src/groupchat_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Non chiedere più"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Chat di gruppo"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Questa stanza non ha oggetto"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s è stato cacciato: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s è stato bandito: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Sei ora conosciuto come %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s è ora conosciuto come %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s se ne è andato"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s è ora %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Cambio oggetto"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Specificare il nuovo oggetto:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Cambio nickname"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Specificare il nuovo nickname da usare:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Segnalibro già impostato"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "La stanza \"%s\" è già tra i segnalibri."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Il segnalibro è stato aggiunto con successo"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "È possibile gestire i segnalibri attraverso il menu Azioni nel roster."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Nessuna connessione disponibile"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Il messaggio non può venire inviato finché non si è connessi."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Nickname non trovato: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s non sembra essere un JID valido"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, fuzzy, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandi: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1483,7 +1599,7 @@ msgstr ""
 "\". Se il JID è correntemente nella stanza, verrà anche cacciato. NON "
 "supporta la presenza di spazi nel nickname."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1491,12 +1607,12 @@ msgstr ""
 "Uso: /%s <nickname>, apre una finestra di chat privata al partecipante "
 "specificato."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, pulisce la finestra di testo."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1505,12 +1621,12 @@ msgstr ""
 "Uso: /%s [motivo], chiude la finestra oi scheda corrente, mostrando il "
 "motivo se specificato."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1519,7 +1635,7 @@ msgstr ""
 "Uso: /%s <JID> [motivo], invita JID alla stanza corrente, opzionalmente "
 "fornendo un motivo."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1528,7 +1644,7 @@ msgstr ""
 "Uso: /%s <stanza>@<server>[/nickname], offre la possibilità di entrare in "
 "stanza@server, opzionalmente usando il nickname specificato."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1539,7 +1655,7 @@ msgstr ""
 "nickname dalla stanza e opzionalmente mostra un motivo. NON supporta la "
 "presenza di spazi nel nickname."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1548,7 +1664,7 @@ msgstr ""
 "Uso: /%s <azione>, invia l'azione alla stanza corrente. Usare la terza "
 "persona (esempio: /%s esplode)."
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1557,41 +1673,88 @@ msgstr ""
 "Uso: /%s <nickname> [messaggio], apre una finestra di messaggi privati ed "
 "invia il messaggio al partecipante specificato per nickname."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Non esiste aiuto per /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Non chiedere più"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Cambio oggetto"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Specificare il nuovo oggetto:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Cambio nickname"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Specificare il nuovo nickname da usare:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Segnalibro già impostato"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "La stanza \"%s\" è già tra i segnalibri."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Il segnalibro è stato aggiunto con successo"
+
+#: ../src/groupchat_control.py:1101
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "È possibile gestire i segnalibri attraverso il menu Azioni nel roster."
+
 #. ask for reason
-#: ../src/groupchat_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Sto cacciando %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Specifica un motivo qui sotto:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Sto bandendo %s"
@@ -1750,43 +1913,38 @@ msgid "Accounts"
 msgstr "Account"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr ""
-"Abilita/disabilita la notifica di quando un trasferimento file è completo"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Azioni av_anzate"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Aggiungi nuovo contatto"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Aggiungi _contatto"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Indirizzo"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avanzato"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Editor di configurazione avanzata"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Dopo il nickname:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Dopo l'ora:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1796,61 +1954,61 @@ msgstr ""
 "Solo composizione\n"
 "Disattivato"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Consentire invio di informazioni sull'_OS"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Permetti di vedere il mio stato"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Consentire notifiche/popup quando _assente/nd/occupato/invisibile."
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Conosciuto anche come stile iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Chiedi messaggio di stato per:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Chiedi di poter vedere il suo stato"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Chiedi:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Assegna chiave Open_PGP"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Autorizza il contatto affinché sappia quando sei connesso"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "_Assente automaticamente dopo:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "N_on disponibile automaticamente dopo:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Partecipa automaticamente"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1862,71 +2020,71 @@ msgstr ""
 "Usa sempre le applicazioni predefinite di KDE\n"
 "Personalizza"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Autorizza automaticamente il contatto"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Riconnettiti automaticamente quando si perde la connessione"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Prima del nickname:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Prima dell'ora:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Data di nascita:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Grassetto"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Costruisci richiesta personalizzata"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Connetti all'avvio di Gajim"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Annulla trasferimento file"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Annulla il trasferimento file selezionato"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Annulla il trasferimento file selezionato e rimuove il file incompleto"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "_Cambia password"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Cambia password"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Cambia _nickname"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Cambia _oggetto"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_fiche dello stato di chat"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1936,7 +2094,7 @@ msgstr ""
 "disturba. Attenzione, verranno bloccati tutti i messaggi ricevuti da "
 "contatti non presenti nel roster."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1948,213 +2106,214 @@ msgstr ""
 "default se il server la annuncia, e abilitando questa opzione TLS sarà "
 "disabilitata."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Scegli _chiave..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Città:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "P_ulisci"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Cliccare per cambiare la password dell'account"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Cliccare per inserire un emoticon (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Cliccare per vedere i servizi (come i trasporti MSN o ICQ) dei server Jabber"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Cliccare per vedere le conversazioni precedenti di questa stanza"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Cliccare per vedere le conversazioni precedenti con questo contatto"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Client:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Società:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Configu_ra la stanza"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Collegati alla pressione di Fine"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Connessione"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Informazioni sul contatto"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Informazioni contatto"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Cronologia conversazione"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Paese:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Icone _stato predefinite:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Elimina MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Elimina messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Elimina il messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Nega"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Dipartimento:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Mostra gli avatar dei contatti nel roster"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Mostra i messaggi di stato dei contatti nel roster"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Modifica gruppi"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Modifica informazioni personali..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Modifica _gruppi"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Emoticon"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Abilita"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Inserire nuovamente per conferma:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Inserire nuova password:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventi"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Ogni _5 minuti"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Indirizzo extra:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Cognome:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Trasferimenti file"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Trasferimenti file"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "File manager:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Stile carattere:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Carattere:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Proibisci di vedere il mio stato"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-GG"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Domande frequenti (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Da:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Vai"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalizzazione temi di Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2162,7 +2321,7 @@ msgstr ""
 "Gajim può ricevere ed inviare meta-informazioni relative ad una "
 "conversazione che con un contatto."
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2170,7 +2329,7 @@ msgstr ""
 "Gajim mostrerà automaticamente i nuovi messaggi ricevuti in una nuova "
 "finestra chat o in una scheda di una finestra chat preesistente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2178,7 +2337,7 @@ msgstr ""
 "Gajim notificherà i nuovi messaggi tramite popup nell'angolo in fondo a "
 "destra dello schermo"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2186,7 +2345,7 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si connette"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2194,72 +2353,72 @@ msgstr ""
 "Gajim notificherà tramite popup nell'angolo in fondo a destra dello schermo "
 "quando un contatto si disconnette"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim cambierà solamente l'icona del contatto che ha mandato il nuovo "
 "messaggio"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Assistente creazione account"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Generale"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Gruppo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Connessione HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Aiuto online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Nasconde la finestra"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Nome dell'host: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Ho già un account da usare"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Voglio _registrare un nuovo account"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Vorrei aggiungerti alla mia lista contatti."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se marcato, Gajim ha anche un'icona nell'area di notifica"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Se marcato, Gajim mostrerà gli avatar dei contatti nella finestra del roster"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2267,15 +2426,15 @@ msgstr ""
 "Se marcato, Gajim mostrerà il messaggio di stato di ogni contatto sotto il "
 "nome nella finestra del roster"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Se marcato, all'avvio Gajim entrerà in questa chat di gruppo"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcato, Gajim ricorderà la password per questo account"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2283,7 +2442,7 @@ msgstr ""
 "Se marcato, Gajim manterrà le posizioni delle finestre di chat e del roster "
 "sullo schermo la prossima volta che verrà eseguito"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2291,7 +2450,7 @@ msgstr ""
 "Se marcato, Gajim  sostituirà gli smiley ASCII come ':)' con gli equivalenti "
 "emoticon grafici"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2299,7 +2458,7 @@ msgstr ""
 "Se marcato, Gajim invierà dei pacchetti di keep-alive per prevenire il "
 "timeout che provoca una disconnessione"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2307,7 +2466,7 @@ msgstr ""
 "Se marcato, Gajim memorizzerà la password in ~/.gajim/config, con permessi "
 "di lettura solo per l'utente che esegue il programma"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2317,7 +2476,7 @@ msgstr ""
 "(es., un contatto MSN avrà l'icona MSN equivalente per gli stati online, "
 "assente, occupato, ecc...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2325,7 +2484,7 @@ msgstr ""
 "Se marcato, Gajim, quando lanciato, si connetterà automaticamente a Jabber "
 "usando questo account."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2334,7 +2493,7 @@ msgstr ""
 "Se marcato, ogni cambio allo stato globale (gestito dalla combo box in fondo "
 "alla finestra del roster) cambierà di conseguenza lo stato di questo account"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2342,167 +2501,180 @@ msgstr ""
 "Se marcato e se sono presenti 2 o più account, Gajim mostrerà tutti i "
 "contatti come se ci fosse un unico account"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Messaggio in arrivo:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Richiesta (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informazioni su di te, archiviate sul server"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Invito ricevuto"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Corsivo"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "ID Jabber: "
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Entra in chat di _gruppo"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Posizione"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Gestisci account"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Gestisci segnalibri"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Gestisci emoticon"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Gestisci profili proxy"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Gestisci..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Secondo nome:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_deratore"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Ancora"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Nickname:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Nessuno"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Notificare i contatti che eseguono:"
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "In _tutti i messaggi"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Invia messaggio e chiudi la finestra"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Apri..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Cifratura OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "O seleziona un messaggio predefinito:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Messaggio in uscita:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "Pass_word:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Password:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefono:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Riproduci _suoni"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Porta: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Posizione:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Codice postale:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Preferenze"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefisso:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Stampa ora:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Pr_iorità:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2512,64 +2684,60 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profilo, avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protocollo:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Costruttore richieste..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registra a"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Rimuovi l'account solo da _Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Eliminare l'account da Gajim e dal _server"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Rimuovi trasferimento file dalla lista"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Rimozione del trasferimento file selezionato"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Rispondi a questo  messaggio"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Reimposta ai colori di default"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "_Risorsa: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2583,217 +2751,213 @@ msgstr ""
 "contemporaneamente. La risorsa con la priorità maggiore riceverà gli eventi "
 "(vedi sotto)."
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Risorsa:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Ruolo:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Configurazione della stanza"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Stanza:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Salva _passphrase (non sicuro)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Salva _posizione e dimensione delle finestre di roster e chat"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Salva i _log delle conversazioni con tutti i contatti"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Salva pass_word"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Cerca"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Invia"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Invia file"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Invia _messaggio singolo"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Invia _file"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Invia _nuovo messaggio..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Invia pacchetti di keep-alive"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Invia messaggio"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Invia messaggio e chiudi la finestra"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Servizi del server"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Imposta MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Imposta _avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Imposta un avatar quando mi connetto"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Imposta messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Mostra tutti gli _eventi pendenti"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Mostra contatti _offline"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Mostra _roster"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Mostra console _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Mostra solo nel _roster"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "C_onnessione"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Disconnessione"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Ordina i contatti per stato"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_to"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Avvia _chat"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Regione:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Stato"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Messaggio di stato:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Stato:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Interruzione del trasferimento file selezionato"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Via:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Oggetto:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Richiesta di abbonamento"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Abbonamento:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Suffisso:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizza lo stato dell'account con lo stato globale"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Colore del testo:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Carattere del _testo:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Il messaggio di stato per l'assenza automatica"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Il messaggio di stato per il 'non disponibile' automatico"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2801,80 +2965,76 @@ msgstr ""
 "Questa azione elimina un singolo trasferimento file dalla lista. Se il "
 "trasferimento è attivo, viene prima fermato e poi rimosso"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "A:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Attiva cifratura Open_PGP"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Inserire il nuovo messaggio di stato:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Sottolinea"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Aggiorna MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Aggiorna messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Aggiorna il messaggio del giorno"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Usa _SSL (legacy)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "_Usa emoticon"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Usa il set di icone _trasporti"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Usa una sola finestra di chat con _schede"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Usa autenticazione"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Usa hostname/port personalizzati"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "ID utente:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2886,15 +3046,15 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Quando si riceve un nuovo evento"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Lavoro"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2902,346 +3062,346 @@ msgstr ""
 "È necessario avere un account per connettersi\n"
 "alla rete Jabber."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Il tuo JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Azioni"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Aggiungi Contatto..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Aggiungi al roster"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Indirizzo:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Amministratore"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avanzato"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizza"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Sfondo:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Bandisci"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Inserire un _segnalibro per questa stanza"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Vista compatta    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Contenuti"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Copia Indirizzo Email/JID"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo collegamento"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Nega"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Ricerca servizi..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia _parole scorrette"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Cronologia"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "I_Q"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icona nell'area di notifica"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non in roster"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Entra in nuova stanza..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Caccia"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Memorizza cronologia conversazione"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Registra i cambiamenti di stato dei contatti"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Client mail:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Unisci account"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Messaggio"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modifica"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Modifica account..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Mai"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Notifica"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifica quando un trasferimento file viene completato"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "Azioni _partecipanti"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "Utenti _online"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Apri composizione email"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Apri il collegamento nel browser"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Proprietario"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Password:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Riproduttore:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Mostra"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Preferenze"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Presenza"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Pubblica"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Esci"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Elimina"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Elimina dal roster"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Rispondi"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Recupera"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Cerca"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Invia"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Invia e Chiudi"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Invia messaggio privato"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Invia messaggio server"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Invia messaggio singolo"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Imposta immagine..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Inizia chat"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Stato"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "A_bbonati"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Abbonamento"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Usa proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Nome utente:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Voce"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "lista trasferimenti file"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minuti"
 
@@ -3251,17 +3411,17 @@ msgstr "minuti"
 msgid "Error: cannot open %s for reading"
 msgstr "Errore: impossibile aprire %s in lettura"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Errore leggendo il file:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3300,93 +3460,103 @@ msgstr "Lo stato ora è: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Lo stato ora è: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Cambiare in %s"
+
+#: ../src/notify.py:145
 #, python-format
 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s ti ha inviato un nuovo messaggio."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vuole inviarti un file."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Hai ricevuto con successo %(filename)s da %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Il trasferimento file di %(filename)s da %(name)s è fermo."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Hai inviato %(filename)s a %(name)s con successo."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Trasferimento file di %(filename)s a %(name)s fermato."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Account uniti"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Sei già nella stanza %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Entra in nuova stanza"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Gestione segnalibri..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "all'account %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "usando l'account %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "per l'account %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Il trasporto \"%s\" verrà rimosso"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3394,67 +3564,67 @@ msgstr ""
 "Non sarai in grado di mandare e ricevere messaggi verso i contatti di questo "
 "trasporto."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Assegna chiave OpenPGP"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Seleziona una chiave da applicare al contatto"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Vorrei aggiungerti al mio roster"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Ri_nomina"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Connetti"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Disconnetti"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dal tuo roster"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3462,28 +3632,28 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, 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:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Stai partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3491,20 +3661,20 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3512,184 +3682,137 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Cambia messaggio di stato..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "usando l'account "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Nascondi questo menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"%s non ha annunciato una chiave OpenPGP e non gliene è stata assegnata una"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Hai appena ricevuto un nuovo messaggio da \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
-"messaggio verrà perso."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
-"messaggio verrà perso."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Invio messaggio privato fallito"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Non sei più nella stanza \"%s\" o \"%s\" è uscito."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Cifratura attivata"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Cifratura disattivata"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Ruolo: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Affiliazione: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Stato: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Risorsa: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Abbonamento: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Scarica"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Invia"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Dimensione: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Trasferito: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Non iniziato"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Fermato"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Completato"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "In pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "In stallo"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Questo servizio non ha ancora inviato informazioni dettagliate"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3703,24 +3826,24 @@ msgstr "Scegli avatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "La dimensione del file immagine \"%s\" è troppo grande"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Il file non deve essere più grande di 32 kilobytes."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3728,7 +3851,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3736,14 +3859,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3751,24 +3874,24 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr "Senza una connessione, non è possibile ottenere i dati personali."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Informazioni personali"
@@ -3777,25 +3900,26 @@ msgstr "Informazioni personali"
 msgid "creating logs database"
 msgstr "creazione database log"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s è un file ma dovrebbe essere una cartella"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim sta per uscire"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "creazione della cartella %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s è una cartella ma dovrebbe essere un file"
@@ -3820,38 +3944,38 @@ msgstr ""
 msgid "Session bus is not available"
 msgstr "Il bus della sessione non è disponibile"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Usa DBus e Notification-Daemon per mostrare le notifiche"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Assente per inattività"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Non disponibile per inattività"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Aggiungere * e [n] al titolo del roster?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3859,12 +3983,12 @@ msgstr ""
 "Quante linee ricordare dalla precedente conversazione quando una scheda/"
 "finestra di chat viene riaperta."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3872,20 +3996,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3894,18 +4018,22 @@ msgstr ""
 "URL personalizzato contenente %s dove %s è la parola/frase o 'WIKTIONARY', "
 "che significa usare wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 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:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3913,23 +4041,23 @@ msgstr ""
 "Imposta l'host inviato per il trasferimento file in caso di traduzione di "
 "indirizzo/port forwarding."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Mostrare scheda quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Mostrare bordo per le schede quando c'è una sola conversazione?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Mostrare il pulsante \"chiudi\" nelle schede?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3937,7 +4065,7 @@ msgstr ""
 "Una lista separata da caratteri ';' di parole che verranno evidenziate nelle "
 "chat multi-utente."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3946,11 +4074,11 @@ msgstr ""
 "cliccato. Questa impostazione è presa in considerazione solo se viene usata "
 "l'icona nello spazio di notifica."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3958,7 +4086,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3966,7 +4094,7 @@ msgstr ""
 "Se Vero, Gajim mostrerà il messaggio di stato, se non vuoto, per ogni "
 "contatto sotto il nome del contatto nella finestra del roster"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:179
 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."
@@ -3974,8 +4102,8 @@ msgstr ""
 "Se Vero, Gajim chiederà un avatar ad ogni contatto che non aveva un avatar "
 "l'ultima volta o ne ha uno troppo vecchio in cache."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3983,72 +4111,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Dormo"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Torno presto"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Di ritorno tra qualche minuto."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Mangio"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Sto mangiando, lascia pure un messaggio"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Sto guardando un film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Lavoro"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Sto lavorando."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefono"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Sono al telefono"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Fuori"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Sono fuori a divertirmi"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4056,7 +4199,7 @@ msgstr ""
 "Suono da riprodurre quando un messaggio MUC contiene una delle parole in "
 "muc_highlight_words, o quando un messaggio MUC contiene il tuo nickname."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4065,61 +4208,66 @@ msgstr ""
 "valore solo se notify_on_all_muc_messages è Vero)."
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "drogheria"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "umano"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "marino"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "semplice"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Non è possibile entrare nella stanza"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Non è possibile entrare nella stanza"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "È necessaria una password per entrare in questa stanza."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Sei bandito da questa stanza."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Questa stanza non esiste."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Non è permessa la creazione di stanze."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "È necessario usare il nickname registrato."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Non appartieni alla lista dei membri."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4127,39 +4275,39 @@ msgstr ""
 "Il nickname desiderato è in uso o registrato da un altro partecipante.\n"
 "Specificare un altro nickname sotto:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 msgid "I would like to add you to my roster."
 msgstr "Vorrei aggiungerti al mio roster."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "si è ora abbonati a %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "richiesta di cancellazione abbonamento da %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "è stato ora cancellato l'abbonamento a %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Connessione con l'account \"%s\" persa"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4169,61 +4317,61 @@ msgstr ""
 "strumenti di gestione del roster come http://jru.jabberstudio.org/ per "
 "rimuoverlo"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Non ci si è potuti collegare a \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Connesso al server %s:%s con %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Controllare la connessione o riprovare più tardi"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autenticazione con \"%s\" fallita"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Non è stata impostata la passphrase OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "invisibile"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Sono %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Questo messaggio è cifrato]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4232,18 +4380,18 @@ msgstr ""
 "Oggetto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "È avvenuto un errore di protocollo:"
 
@@ -4365,10 +4513,6 @@ msgstr "_Invisibile"
 msgid "Invisible"
 msgstr "Invisibile"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Non presente nel roster"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Sconosciuto"
@@ -4456,10 +4600,39 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "account: "
+#~ msgstr "account: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Si è sicuri di voler uscire dalle stanze \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Chiudendo questa finestra, si verrà disconnessi da queste stanze."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr ""
+#~ "Abilita/disabilita la notifica di quando un trasferimento file è completo"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Rimozione del trasferimento file selezionato"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Interruzione del trasferimento file selezionato"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Usa una sola finestra di chat con _schede"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Se questa scheda viene chiusa e la cronologia è disabilitata, questo "
+#~ "messaggio verrà perso."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Impossibile rimuovere l'ultimo gruppo"
 
@@ -4544,9 +4717,6 @@ msgstr "cyan"
 #~ msgid "Chat with"
 #~ msgstr "Chatta con"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
 #~ msgid "Log presences in _contact's log file"
 #~ msgstr "Registra le informazioni di presenza nel file di _log del contatto"
 
diff --git a/po/nb/LC_MESSAGES/gajim.po b/po/nb/LC_MESSAGES/gajim.po
index 248c43ff588fe1378f59da0a99fcf89937c28ec4..63018743f5aa1c1891c2a75d30b9831756df84fb 100644
--- a/po/nb/LC_MESSAGES/gajim.po
+++ b/po/nb/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-08 14:28+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -20,9 +20,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -52,39 +51,8 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Gjemt"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Samtale"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Gruppe Samtale"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "konto:"
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "ikke i kontaktliste"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Endre til %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -100,218 +68,372 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "ikke i kontaktliste"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Samtale"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Kryptering"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Kryptering påslått"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Kryptering avslått"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Du fikk akkurat en ny melding fra \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
+"mistet."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Medlem"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Eier"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrator"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Kast ut"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Rolle:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Utvis %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Hva ønsker du å gjøre?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, 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:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, 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:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrator"
+
+#: ../src/config.py:1961
+#, 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:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nytt Rom"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -320,23 +442,23 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -344,48 +466,48 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -411,12 +533,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transporter"
 
@@ -471,44 +593,67 @@ msgstr "Kontakten er allerede listet  i din kontaktliste."
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -517,137 +662,154 @@ msgstr ""
 "Ã¥ sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt Logget PÃ¥"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Fra %s i rom %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Fra %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Til %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Du har blitt invitert til %(room_jid)s rommet av %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -694,11 +856,6 @@ msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 msgid "Browsing %s"
 msgstr "Utforsking %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Utforsk"
@@ -707,30 +864,30 @@ msgstr "_Utforsk"
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -751,7 +908,7 @@ msgstr "Fremdrift"
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
@@ -767,8 +924,8 @@ msgstr "Du"
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -781,7 +938,7 @@ msgstr "Lagret i: %s"
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Ã…pne Foreldre Katalog"
 
@@ -805,50 +962,55 @@ msgstr "Velg Fil for Sending..."
 msgid "Send"
 msgstr "Send"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Denne filen finnes fra før"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Hva ønsker du å gjøre?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Denne filen finnes fra før"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -856,37 +1018,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -1149,31 +1311,31 @@ msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1182,83 +1344,83 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, 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:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "feil ved sending"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard publisering vellykket"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Din personlige informasjon har blitt publisert uten feil."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1268,36 +1430,36 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Loggene ble migrert til databasen uten feil."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Vennligst vent mens loggene blir migrert..."
 
@@ -1318,149 +1480,100 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
-
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
-"Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
 
-#. just in one room
-#: ../src/groupchat_window.py:155
-#, 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:79
+msgid "Sending private message failed"
+msgstr "Sending av privat melding feilet"
 
-#: ../src/groupchat_window.py:156
-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."
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
+#, 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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Dette rommet har ingen tittel"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Endrer Tittel"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Vennlist skriv inn ny tittel:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Endrer Kallenavn"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Rommet \"%s\" er allerede i dine bokmerker."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Tilkobling ikke tilgjengelig"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, 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_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1473,7 +1586,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1481,12 +1594,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1495,12 +1608,12 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1509,7 +1622,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [Ã¥rsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1518,7 +1631,7 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1529,7 +1642,7 @@ msgstr ""
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1538,7 +1651,7 @@ msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1547,19 +1660,19 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
 "sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1567,23 +1680,70 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Endrer Tittel"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Vennlist skriv inn ny tittel:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Endrer Kallenavn"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Bokmerke allerede satt"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Rommet \"%s\" er allerede i dine bokmerker."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bokmerke har blitt lagt til"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
@@ -1742,42 +1902,38 @@ msgid "Accounts"
 msgstr "Kontoer"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Av_anserte Handlinger"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Ny _Kontakt"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Etter kallenavn:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Etter tid:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1787,62 +1943,62 @@ msgstr ""
 "Bare komponering \n"
 "Deaktivert"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Forespør hans/hennes status"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Spør:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Tilegn Open_PGP Nøkkel"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Auto _borte etter:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Auto bli med"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1854,71 +2010,71 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automatisk godkjenn kontakt"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Koble til på nytt automatisk når kontakten mistes"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Før kallenavn:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Før tid:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Fødselsdag:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Fet"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Lag din egen spørring"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Avbryt filoverføring"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter valgte filoverføring"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Avbryter valgte filoverføring og fjerner den uferdige filen"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Endre Passord"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Endre _Kallenavn"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Endre _Tema"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Samtale status opp_lysninger:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1928,7 +2084,7 @@ msgstr ""
 "Bruk med varsomhet, fordi det blokkerer alle meldinger fra lle kontakter som "
 "ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1940,211 +2096,212 @@ msgstr ""
 "standard dersom dette tilbys av servere, og med dette valget blir TLS "
 "deaktivert."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "By:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Rydd _opp"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikk for å sette inn et uttrykksikon (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Klikk for å se tidligere samtaler i dette rommet"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Bedrift:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Konfigurer _Rom"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Kontakt_Info"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Standard _status ikonsamling:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Slett MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Slett Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Avdeling:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Viser kontaktikoner for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Vis status melding for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Behandle Uttrykksikoner"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Hvert 5 _minutt"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Etternavn:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fil _Overføringer"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Fil behandler:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stilte Spørsmål (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "G_Ã¥"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2152,7 +2309,7 @@ msgstr ""
 "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
 "med en kontakt"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2160,7 +2317,7 @@ msgstr ""
 "Gajim vil autmatisk vise deg den nye meldingen i et samtalevindu eller fane "
 "i det eksisterende samtalevinduet"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2168,7 +2325,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at du har fått en ny melding"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2176,7 +2333,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget inn"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2184,71 +2341,71 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajimvil bare endre ikonet til kontakten som har sendt den nye meldingen"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Generelle"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Fornavn:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP Connect"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Hjelp online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Lukker vinduet"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Hjemmeside:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Jeg har allerede en konto jeg ønsker å bruke"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2256,15 +2413,15 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2272,7 +2429,7 @@ msgstr ""
 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
 "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2280,7 +2437,7 @@ msgstr ""
 "Dersom valgt vil Gajim bytte ut \"smilies\" som ':)' med grafiske "
 "uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2288,7 +2445,7 @@ msgstr ""
 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en "
 "frakobling på grunn av inaktivitet"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2296,7 +2453,7 @@ msgstr ""
 "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
 "bare for deg"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2305,7 +2462,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2313,7 +2470,7 @@ msgstr ""
 "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
 "ved oppstart"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2322,7 +2479,7 @@ msgstr ""
 "Dersom valgt vil endringer til global status (håndtert av kombomenyen "
 "nederst i kontaktvinduet) endre status på denne kontoen. "
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2330,167 +2487,180 @@ msgstr ""
 "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
 "kontakter som om du hadde en konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Innkommende melding:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Informasjon/Spørring"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Plassering"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Behandle Kontoer"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Behandle Uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Behandle..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mod_ererer"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "PÃ¥ hver _melding"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Send melding og lukk vinduet"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Ã…pne..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Kryptering"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Eller velg en forhåndsvalgt melding:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Utgående melding:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port:"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Plassering:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2500,63 +2670,59 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, Bilde"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Spørrings Bygger..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrer til:"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Fjern valgte filoverføring"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Tilbakestill til Standard Farger"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2570,217 +2736,213 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Søk"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Send Fil"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Send _Fil"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Send _Ny Melding..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Velg MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Velg Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Velg _Avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Velg et ikonbilde (avatar) når jeg kobler til"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Fylke:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Status melding:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Stopp valgte filoverføring"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Abbonerings Forespørsel"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Abbonement:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Suffix:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2788,79 +2950,75 @@ msgstr ""
 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
 "den først bli stoppet og så fjernet."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Til:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Endre Open_PGP Kryptering"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Skriv inn din nye status melding:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Skriv:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Strek Under"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Oppdater MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Oppdater Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Bruk _uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Bruk et enkelt samtalevindu med _faner"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2872,15 +3030,15 @@ msgstr ""
 "bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale "
 "med."
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "NÃ¥r en ny hendelse blir motatt"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Jobb"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2888,346 +3046,346 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Din JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Lag _Bokmerke til Rommet"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Kopier Link PLassering"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikon i systemstatusfelt (også kjent som systray)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Bli med i Nytt Rom"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Navn:"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Beboer Handling"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Online Brukere"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Ã…pne ny Epost"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Ã…pne Link i Nettleser"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publisér"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Hent"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Søk"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Send"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Send Server Melding"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Send Melding"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Velg Bilde..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Abbonér"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Abonement"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Bruk proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML Konsoll..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutter"
 
@@ -3237,17 +3395,17 @@ msgstr "minutter"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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."
@@ -3285,92 +3443,102 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Endre til %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s har sendt deg en ny melding."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, 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/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Bli med i Nytt Rom"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3378,69 +3546,69 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "NÃ¥ vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "NÃ¥ vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3448,28 +3616,28 @@ 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3477,19 +3645,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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3497,183 +3665,137 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "bruker konto"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s har ikke sendt en OpenPGP nøkkel og du har ikke tilegnet en"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Du fikk akkurat en ny melding fra \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
-"mistet."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Dersom du lukke denne fanen og du har slått av historikk, vil meldingen bli "
-"borte."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Sending av privat melding feilet"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Kryptering påslått"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Kryptering avslått"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3687,24 +3809,24 @@ msgstr "Velg Bilde"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Filstørrelsen på bilde \"%s\" er for stor"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Filen må ikke være mer enn 32 kilobyte."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3712,7 +3834,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3720,13 +3842,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3734,23 +3856,23 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Personlig Informasjon"
@@ -3759,25 +3881,26 @@ msgstr "Personlig Informasjon"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s er en katalog men skulle vært en fil"
@@ -3800,38 +3923,38 @@ msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 msgid "Session bus is not available"
 msgstr "Sesjons buss ikke tilgjengelig"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3839,12 +3962,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3852,20 +3975,20 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3874,17 +3997,21 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3892,29 +4019,29 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 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:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3922,11 +4049,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3934,7 +4061,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3942,7 +4069,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:168
+#: ../src/common/config.py:179
 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."
@@ -3950,8 +4077,8 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3959,72 +4086,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4032,7 +4174,7 @@ msgstr ""
 "Lyd som spilles når en MUC melding inneholder et av ordene i "
 "muc_highlight_words, eller når en MUC melding inneholder ditt kallenavn."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4041,61 +4183,66 @@ msgstr ""
 "aktiv når notify_on_all_muc_messages er True)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "enkel"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Et passord kreves for å bli med i dette samtalerommet."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Du er uønsket i dette rommet."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Et slikt rom finnes ikke."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Rom oppretting er begrenset."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerte kallenavn må bli brukt. "
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Du er ikke medlems listen."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4104,38 +4251,38 @@ msgstr ""
 "samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abbonerer nå på %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abbonerer ikke lenger på %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4145,61 +4292,61 @@ msgstr ""
 "Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
 "for å fjerne den"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4208,16 +4355,16 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "En protokoll feil har skjedd:"
 
@@ -4339,10 +4486,6 @@ msgstr "_Usynlig"
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Ikke i kontaktlisten"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
@@ -4430,10 +4573,39 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "turkis"
 
+#~ msgid "account: "
+#~ msgstr "konto:"
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Fjern valgte filoverføring"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Stopp valgte filoverføring"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Bruk et enkelt samtalevindu med _faner"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Dersom du lukke denne fanen og du har slått av historikk, vil meldingen "
+#~ "bli borte."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan ikke fjerne den siste gruppen"
 
diff --git a/po/nl/LC_MESSAGES/gajim.po b/po/nl/LC_MESSAGES/gajim.po
index 50fa32727361c2eccfb7acf46d544806d7eb92be..4008dfa171e99b4108f4d2bb43464319a78af3f0 100644
--- a/po/nl/LC_MESSAGES/gajim.po
+++ b/po/nl/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -25,9 +25,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Een GTK+ Jabber client"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -57,39 +56,8 @@ msgstr "(Niets)"
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Gesprek"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Groupsgesprek"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "account: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "niet in het rooster"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Schakel over naar %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -105,224 +73,379 @@ msgstr ""
 "\n"
 "De markering van spelfouten zal niet worden gebruikt."
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Er is geen verbinding beschikbaar"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "niet in het rooster"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Gesprek"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Versleuteling"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Versleuteling ingeschakeld"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Versleuteling uitgeschakeld"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, 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:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
+"verlorgen gaan."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Elke %s _minuten"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Actief"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Gebeurtenis"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Geluid"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "titel statusbericht"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "statusbericht"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP is niet bruikbaar op deze computer"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Je bent momenteel verbonden met de server"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 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:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Ongeldige account naam"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Account naam kan niet leeg zijn."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Account naam mag geen spaties bevatten."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Ongeldige Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 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:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Ongeldige invoer"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Aangepaste poort moet een geldig poortnummer zijn."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Account bestaat niet"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Kon de geheime sleutel niet ophalen"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Kies je OpenPGP sleutel"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Geen sleutel geselecteerd"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Naam"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Wijzig %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registreer met %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Lid"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Eigenaar"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrator"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "Uit_schoppen"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Rol:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "%s verbannen"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrator"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Afbeelding"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Account \"%s\" heeft verbinding met de server"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Als je het verwijdert, wordt de verbinding verbroken."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nieuwe Ruimte"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Deze bladwijzer bevat ongeldige informatie"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Ongeldige gebruikersnaam"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Je moet een gebruikersnaam invullen om deze account te configureren."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Ongeldig wachtwoord"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Je moet een wachtwoord invullen voor de nieuwe account"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Account is met succes toegevoegd"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -330,23 +453,23 @@ 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:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Je nieuwe account is met succes aangemaakt"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Er is een gout opgetreden bij het aanmaken van de account"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Account naam is al in gebruik"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Je hebt al een account met deze naam."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -354,49 +477,49 @@ msgstr ""
 "Tekst onder deze streep is gezegd nadat je laatst op dit groepsgesprek gelet "
 "hebt."
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Acties voor \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Lees _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Zoek op in het _Woordenboek"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 "\"%s\" ontbreekt in de URL van het woordenboek en het is geen WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "\"%s\" ontbreekt in de URL van de Web Zoekmachine"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Zoek op het Web"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Gisteren"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagen geleden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Onderwerp: %s\n"
@@ -422,12 +545,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transporten"
 
@@ -483,46 +606,69 @@ msgstr "Deze contact staat al op je rooster"
 msgid "A GTK+ jabber client"
 msgstr "Een GTK+ jabber client"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Stéphan Kochen <stephan@kochen.nl>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnerings aanvraag voor account %s van %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnering aangevraagd van %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Neem deel aan Groepsgesprek met account %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Neem deel aan Groepsgesprek"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Ongeldige gebruikersnaam"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start Gesprek met account %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Start Gesprek"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -531,137 +677,154 @@ msgstr ""
 "worden:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Verbinding niet beschikbaar"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Zorg ervoor dat je verbinding hebt met \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Zonder verbinding is het niet mogelijk je wachtwoord te veranderen."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Je moet een wachtwoord opgeven."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Wachtwoord komt niet overeen"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "De wachtwoorden in beide velden moeten identiek zijn"
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Contact is Ingelogd"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Contact is Uitgelogd"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nieuw Bericht"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nieuw Enkel Bericht"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nieuw Privé Bericht"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Van %s in ruimte %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Van %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Bestandsoverdracht Verzoek"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Bestandsoverdracht Fout"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Bestandsoverdracht Voltooid"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Bestandsoverdracht Gestopt"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Aan %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enkel Bericht met account %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Enkel Bericht"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Stuur %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s schreef:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Console voor %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Console"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "%(contact_jid)s heeft je uitgenodigd %(room_jid)s binnen te komen"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
@@ -709,11 +872,6 @@ msgstr "Dit soort service heeft geen onderdelen om te doorbladeren."
 msgid "Browsing %s"
 msgstr "Doorbladeren van %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Bladeren"
@@ -722,30 +880,30 @@ msgstr "_Bladeren"
 msgid "This service does not contain any items to browse."
 msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Binnengaan"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Onderzoeken %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Gebruikers"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Beschrijving"
 
@@ -766,7 +924,7 @@ msgstr "Voortgang"
 msgid "Filename: %s"
 msgstr "Bestandsnaam: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Grootte: %s"
@@ -782,8 +940,8 @@ msgstr "Jij"
 msgid "Sender: %s"
 msgstr "Afzender: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Ontvanger: "
 
@@ -796,7 +954,7 @@ msgstr "Opgeslagen in: %s"
 msgid "File transfer completed"
 msgstr "Bestandsoverdracht afgerond"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Open Bovenliggende Map"
 
@@ -820,50 +978,55 @@ msgstr "Kies het Bestand om te Sturen"
 msgid "Send"
 msgstr "Verzend"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim heeft geen toegang tot dit bestand"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Dit bestand is in gebruik door een ander proces."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Dit bestands bestaat al"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Wat wil je doen?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Bestand: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Beschrijving: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s wil je een bestand sturen:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Sla Bestand op als..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Dit bestands bestaat al"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -871,37 +1034,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Ongeldig Bestand"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Bestand: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Het is onmogelijk lege bestanden te sturen"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Naam: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Afzender: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pauze"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Verder"
 
@@ -1171,31 +1334,31 @@ msgstr ""
 "Argument \"%s\" is niet gespecificeerd. \n"
 "Type \"%s help %s\" voor meer info"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim vereist een Xserver en zal nu stoppen..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim vereist PyGTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim vereist GTK 2.6 of nieuwer"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Libglade ondersteuning ontbreekt in de GTK+ runtime"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1203,84 +1366,84 @@ msgid ""
 msgstr ""
 "Verwijder je GTK+ runtime en installeer de laatste stabiele versie van %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, 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:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim vereist PySQLite2"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Machtiging voor %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Neem je dit verzoek aan?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "fout tijdens versturen"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Machtiging geaccepteerd"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contact \"%s\" heeft het abonnement op jou opgezegd"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Je zult hem altijd als offline zien."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kan geen contact maken met \"%s\""
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Controleer de verbinding of probeer later nogmaals."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s is nu %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Je wachtwoord is incorrect"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Je bent momenteel verbonden zonder OpenPGP sleutel."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard publicatie is met succes afgerond"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Je persoonlijke informatie is met succes gepubliceerd."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1290,36 +1453,36 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Logboeken zijn met succes omgezet naar de database."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
@@ -1340,149 +1503,99 @@ msgstr "Je kunt je huidige thema niet verwijderen"
 msgid "Please first choose another for your current theme."
 msgstr "Kies eerst een ander thema."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Weet je zeker dat je de ruimten \"%s\" wilt verlaten?"
-
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
-"Als je dit venster sluit zal de verbinding verbroken worden met deze ruimten."
 
-#. just in one room
-#: ../src/groupchat_window.py:155
-#, 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:79
+msgid "Sending private message failed"
+msgstr "Sturen van privé bericht mislukt"
 
-#: ../src/groupchat_window.py:156
-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."
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
+#, 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_window.py:160
-msgid "Do _not ask me again"
-msgstr "Vraag mij dit niet nogmaals"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Groupsgesprek"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Deze ruimte heeft geen onderwerp"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s is uit de ruimte geschopt: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s is uit de ruimte verbannen: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Je staat nu bekend als %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s is nu bekend als %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s heeft de ruimte verlaten"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s is nu %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Onderwerp Veranderen"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Geef het nieuwe onderwerp op:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Bijnaam Veranderen"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bladwijzer bestaat al"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Ruimte \"%s\" heeft al een bladwijzer."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bladwijzer is met succes toegevoegd"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Je kunt bladwijzers beheren via het Acties menu in je rooster."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Er is geen verbinding beschikbaar"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Je bericht kan niet worden verzonden totdat je verbinding hebt."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Bijnaam niet gevonden: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s blijkt geen geldige JID te zijn"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Commando's: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1495,7 +1608,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1503,12 +1616,12 @@ msgstr ""
 "Gebruik: /%s <bijnaam>, opent een privé gespreksvenster met de opgegeven "
 "gebruiker."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Gebruik: /%s, leegt het tekst venster."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1517,12 +1630,12 @@ msgstr ""
 "Gebruik: /%s [reden], sluit de huidige tab of venster, en laat reden achter "
 "indien opgegeven."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1531,7 +1644,7 @@ msgstr ""
 "Gebruik: /%s <JID> [reden], nodigt JID uit de huidige ruimte binnen te "
 "komen, met optioneel de opgegeven reden."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1540,7 +1653,7 @@ msgstr ""
 "Gebruik: /%s <ruimte>@<server>[/bijnaam], biedt aan ruimte@server binnen te "
 "gaan, optioneel met de opgegeven bijnaam."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1551,7 +1664,7 @@ msgstr ""
 "bijnaam van de ruimte, optioneel met de opgegeven reden. Ondersteunt GEEN "
 "spaties in de bijnaam."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1560,7 +1673,7 @@ msgstr ""
 "Gebruik: /%s <actie>, stuurt actie naar de huidige ruimte. Hij-vorm "
 "gebruiken. (bijv. /%s loopt...)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1569,42 +1682,90 @@ msgstr ""
 "Gebruik: /%s <bijnaam> [bericht], opent een privé gespreksvenster en stuurt "
 "bericht naar de gebruiker met de opgegeven bijnaam."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Geen hulp beschikbaar voor /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Vraag mij dit niet nogmaals"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Onderwerp Veranderen"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Geef het nieuwe onderwerp op:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Bijnaam Veranderen"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Geef de nieuwe bijnaam op die je wilt gebruiken:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Bladwijzer bestaat al"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Ruimte \"%s\" heeft al een bladwijzer."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bladwijzer is met succes toegevoegd"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "%s uit de ruimte schoppen"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Je kunt hieronder een reden opgeven:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
@@ -1763,42 +1924,38 @@ msgid "Accounts"
 msgstr "Accounts"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "In-/Uitschakelen berichtgeving als een bestandsoverdracht voltooid is"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Gea_vanceerde Acties"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Nieuwe Contact Toevoegen"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "_Contact Toevoegen"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Geavanceerde Configuratie Wijzigen"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Na bijnaam:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Na tijdsstempel:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1808,66 +1965,66 @@ msgstr ""
 "Alleen bij typen van bericht\n"
 "Uitgeschakeld"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Sta toe informatie over _besturingssysteem te verzenden"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Sta hem/haar toe mijn status te zien"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Ook bekend als iChat-stijl"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Vraag om status bericht als ik:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Vraag hem/haar toestemming zijn/haar status te zien"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Vraag:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Wijs Open_PGP Sleutel toe"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Automatisch _afwezig na:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automatisch _niet beschikbaar na:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Automatisch binnengaan"
 
 # deelnemen?
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1879,73 +2036,73 @@ msgstr ""
 "Gebruik altijd standaard KDE toepassingen\n"
 "Aangepast"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automatisch contacten toestemming geven"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatisch verbinding herstellen als deze verbroken wordt"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Voor bijnaam:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Voor tijdsstempel:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Verjaardag:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Vetgedrukt"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Bouw aangepaste query"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Automatisch _verbinding maken als Gajim opstart"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Bestandsoverdracht annuleren"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Annuleert de geselecteerde bestandsoverdracht"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Annuleert de geselecteerde bestandsoverdracht en verwijdert het onvolledige "
 "bestand"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Verander Wachtwoord"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Verander Wachtwoord"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Verander Bij_naam"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Verander _Onderwerp"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Gesprekstoestands _mededelingen:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1955,7 +2112,7 @@ msgstr ""
 "lastigvalt. Wees voorzichtig, met deze optie worden all berichten van "
 "contacten niet op je rooster geblokkeerd"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1966,217 +2123,218 @@ msgstr ""
 "Let op, deze functionaliteit werkt mogelijk alleen bij oudere servers. Gajim "
 "gebruikt standaard al TLS waar mogelijk. Deze optie schakelt TLS echter uit."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Kies _Sleutel..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Stad:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Ruim _op"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Klik om het wachtwoord van de account te veranderen"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klik om een emoticon in te voegen (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klik om mogelijkheden (zoals MSN, ICQ transporten) van jabber servers te zien"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Klik om de gespreksgeschiedenis van deze ruimte te bekijken"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Klik om de gespreksgeschiedenis van deze contact te bekijken"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Client:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Bedrijf:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Configureer _Ruimte"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Verbind zodra ik Afronden druk"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Contact Informatie"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Contact _Info"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Standaard _status iconenset:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Wis MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Wis het Bericht van de Dag"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Zal het Bericht van de Dag wissen"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Weigeren"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Afdeling:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Statusberichten van contacten weergeven in het rooster"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Wijzig Groepen"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Wijzig Persoonlijke Informatie..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Wijzig _Groepen"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Beheer Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Inschakelen"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Geef opnieuw op ter bevestiging:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Geef nieuw wachtwoord op:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Gebeurtenissen"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Elke 5 _minuten"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Extra Adres:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Familie:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Bestandsoverdrachten"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Bestands_overdrachten"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Letterstijl:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Lettertype:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Verbiedt hem/haar mijn status te zien"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formaat: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Veel Gestelde Vragen (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Van:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "Ga"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Themas Aanpassen"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 msgstr "Gajim kan de gesprekstoestanden versturen en ontvangen"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2184,14 +2342,14 @@ msgstr ""
 "Gajim zal automatisch nieuwe berichten in een nieuw venster of tab in een "
 "bestaand venster laten zien"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
 msgstr ""
 "Gajim zal nieuwe berichten mededelen m.b.v. een popup rechtsonder in beeld"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2199,7 +2357,7 @@ msgstr ""
 "Gajim zal contacten die zich aanmelden mededelen m.b.v. een popup "
 "rechtsonder in beeld"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2207,73 +2365,73 @@ msgstr ""
 "Gajim zal contacten die zich afmelden mededelen m.b.v. een popup rechtsonder "
 "in beeld"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim zal alleen het contacticoon veranderen bij nieuwe berichten"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Wizard Account Aanmaken"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Algemeen"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Voornaam:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Groep:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP Verbinden"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Hulp online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Verbergt het venster"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Hostnaam: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Ik heb al een account die ik wil gebruiken"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Ik wil een nieuwe account _registreren"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Ik wil je graag toevoegen aan mijn contactlijst"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr ""
 "Indien aangevinkt zal Gajim een icoon in het mededelingengebied (systray) "
 "weergeven"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Indien aangevinkt zal Gajim contactafbeeldingen in het roostervenster laten "
 "zien"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2281,17 +2439,17 @@ msgstr ""
 "Indien aangevinkt zal Gajim statusberichten van contacten onder de "
 "contactnaam in het roostervenster laten zien."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Indien aangevinkt zal Gajim zich automatisch aanmelden bij dit groepsgesprek "
 "tijdens het opstarten"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Indien aangevinkt zal Gajim het wachtwoord onthouden voor deze account"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2299,7 +2457,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim de positie en grootte van vensters onthouden "
 "voor de volgende keer dat ze geopend worden"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2307,7 +2465,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim tekst smilies, zoals ':)', vervangen met "
 "bijpassende grafische emoticons"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2315,7 +2473,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim keep-alive-paketten sturen om de verbinding in "
 "stand te houden"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2323,7 +2481,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim wachtwoorden opslaan in ~/.gajim/config met "
 "alleen leesrechten voor allen jou"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2333,7 +2491,7 @@ msgstr ""
 "(Bijv. contacten van MSN zullen met msn iconen weergegeven worden voor "
 "status online, afwezig, bezig, enz...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2341,7 +2499,7 @@ msgstr ""
 "Indien aangevinkt zal Gajim automatisch verbinding maken met deze account "
 "bij het opstarten"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2351,7 +2509,7 @@ msgstr ""
 "lijstknop onderaan het roostervenster) de status van deze account "
 "meeveranderen."
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2359,167 +2517,180 @@ msgstr ""
 "Indien aangevinkt en je twee of meer accounts hebt, zal Gajim de contacten "
 "van alle accounts samenvoegen alsof ze een grote account zijn."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Binnenkomend bericht:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Vraag (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informatie over jou, zoals op de server opgeslagen"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Uitnodiging Ontvangen"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Schuingedrukt"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Neem deel aan _Groepsgesprek"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Locatie"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Beheer Accounts"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Beheer Bladwijzers"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Beheer Emoticons"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Beheer Proxy Profielen"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Beheer..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Middelste naam:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "_Beheerder"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Meer"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Bijnaam:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Geen"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Geef mij bericht over contacten die: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "Besturingssysteem:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Bij elk _bericht"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Bericht verzenden en venster sluiten"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Open..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Versleuteling"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Of kies een vooraf ingesteld bericht:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Uitgaand bericht:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Persoonlijke Informatie"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefoonnummer:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Speel _geluiden af"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Poort: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Positie:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Postcode:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Voorkeuren"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Voorvoegsel:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Print tijd:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priori_teit"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2529,65 +2700,61 @@ msgstr ""
 "ontvangt als er twee keer op dezelfde account ingelogd is; de hoogste  "
 "prioriteit wint."
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profiel, Contactafbeelding"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Query Bouwer..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Recent:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registreer naar"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Verwijder account alleen van Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Verwijder account van Gajim en van de server"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Verwijder bestandsoverdracht van de lijst."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Verwijderen van geselecteerde bestandsoverdracht"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Beantwoord dit bericht"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Herstel naar Standaard Kleuren"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "_Bron: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2600,217 +2767,213 @@ 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:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Bron:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Rol:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Ruimte Configuratie"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Ruimte:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Sla _wachtwoord op (onveilig)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Sla _positie en grootte op voor rooster- en gespreksvensters"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Sla gespreks_logboek op voor alle contacten"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Sla _wachtwoord op"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Zoek"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Verzen_d"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Bestand Verzenden"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Enkel _Bericht Verzenden"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "_Bestand Verzenden"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Stuur _Nieuw Bericht..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Keep-alive-pakketten verzenden"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Bericht verzenden"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Bericht verzenden en venster sluiten"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Server Mogelijkheden"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Stel MOTD in"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Stel Bericht van de Dag in"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Stel Contact_afbeelding in"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Stel een contactafbeelding in zodra ik verbinding maak"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Stelt het Bericht van de Dag in"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Laat Alle Wachtende Gebeurtenissen Zien"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "_Offline Contacten Weergeven"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "_Rooster Weergeven"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "_XML Console Weergeven"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Alleen in _rooster weergeven"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Inloggen"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Uitloggen"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Sorteer contacten op status"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Start _Gesprek"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Staat:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Status bericht:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Stopt geselecteerde bestandsoverdracht"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Straat:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Onderwerp:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Abonneringsverzoek"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Abonnement:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Achtervoegsel:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_roniseer account status met globale status"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Tekst_kleur"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Letter_type"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Het statusbericht voor automatische afwezigheid"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Het statusbericht voor automatisch niet beschikbaar"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Thema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2818,79 +2981,75 @@ msgstr ""
 "Deze actie verwijdert een enkele bestandsoverdracht van de lijst. Als de "
 "overdracht actief is, wordt hij eerst gestopt en dan verwijdert"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Aan:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Schakel Open_PGP Codering om"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Typ je nieuwr statusbericht:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Type:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Onderstreept"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "MOTD Bijwerken"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Bericht van de Dag Bijwerken"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Werkt Bericht van de Dag bij"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Gebruik _SSL (verouderd)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Gebruik _emoticons"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Gebruik _transport iconensets"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Gebruik enkel gespreksvenster met _tabs"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Gebruik aanmelding"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Gebruik aangepaste hostnaam/poort"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Gebruikers ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2902,15 +3061,15 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Als een nieuwe gebeurtenis ontvangen is"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Werk"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2918,346 +3077,346 @@ msgstr ""
 "Je hebt een account nodig om verbinding te maken\n"
 "met het Jabber netwerk."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Jouw JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Acties"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Contact Toevoegen..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Toevoegen aan Roster"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "Gea_vanceerd"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Toestemmen"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Achtergrond:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "Ver_bannen"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Maak _Bladwijzer Voor Deze Ruimte"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Annulerem"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Compacte Weergave    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Inhoud"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopieer JID/Email Adres"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Kopieer Link Lokatie"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Weigeren"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "Ontdek Services..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Groupsgesprek"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Icoon in mededelingsgebied"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "Nieuwe Ruimte Binnengaan..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "Uit_schoppen"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "Gespreksgeschiedenis"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "Houdt status veranderingen van contacten bij in het logboek"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Mail client:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Lid"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "Accounts _samenvoegen"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Bericht"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "Be_werk"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "Account Be_werken..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Naam: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nooit"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Stel mij ervan op de hoogte"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Stel mij op de hoogte als een bestandsoverdracht voltooid is"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Gebruiker Acties"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Online Gebruikers"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Open Email Samensteller"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Eigenaar"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Wachtwoord:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pauze"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Speler:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Opduiken"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Poort:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Voorkeuren"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Aanwezigheid"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publiceren"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "A_fsluiten"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Verwijder"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Verwijder van Rooster"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Hernoem"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "Be_antwoord"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Haal op"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Zoek"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "Ver_stuur"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "Ver_stuur & Sluit"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "Ver_stuur Privé Bericht"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "Ver_stuur Server Bericht"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "Ver_stuur Enkel Bericht"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Stel Afbeelding in..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Start Gesprek"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Abonneer"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Abonnement"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Gebruik proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Gebruikersnaam:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Stem"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML Console..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "bestandsoverdrachtlijst"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minuten"
 
@@ -3267,17 +3426,17 @@ msgstr "minuten"
 msgid "Error: cannot open %s for reading"
 msgstr "Fout: kan %s niet voor lezen openen"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Fout bij lezen bestand:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3316,93 +3475,103 @@ msgstr "Status is nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status is nu: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Schakel over naar %s"
+
+#: ../src/notify.py:145
 #, python-format
 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s heeft je een nieuw bericht gestuurd."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s wil je een bestand sturen."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, 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/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s van %(name)s gestopt."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, 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/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Bestandsoverdracht van %(filename)s aan %(name)s gestopt."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Samengevoegde accounts"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "Nieuwe Ruimte _Binnengaan"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Beheer Bladwijzers..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "aan %s account"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "via %s account"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "via account %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "voor account %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zal worden verwijderd"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3410,67 +3579,67 @@ msgstr ""
 "Het zal niet meer mogelijk zijn berichten te sturen en ontvangen van "
 "contacten via deze transport"
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Wijs een OpenPGP sleutel toe"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Selecteer een sleutel om aan de contact toe te wijzen"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 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:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Her_noem"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Log in"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "Log _uit"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3478,28 +3647,28 @@ 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, 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:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3508,21 +3677,21 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3530,184 +3699,137 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Wijzig Statusbericht..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "via account"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Verberg dit menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"%s heeft geen OpenPGP sleutel uitgezonden en je hebt er geen toegewezen"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Je hebt zojuist een nieuw bericht ontvangen van \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Als je deze tab sluit en geschiedenis uitgeschakeld hebt zal dit bericht "
-"verlorgen gaan."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Als je deze tab sluit en geschiedenis uitgeschakelt hebt zal dit bericht "
-"verloren gaan."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Sturen van privé bericht mislukt"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Je bent niet meer in ruimte \"%s\" of \"%s\" heeft de ruimte verlaten."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Versleuteling ingeschakeld"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Versleuteling uitgeschakeld"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Aansluiting: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Bron: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Grootte: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Verzonden: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Niet gestart"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Gestopt"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Afgerond"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Gepauzeerd"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Vastgelopen"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Verzenden"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Deze service heeft nog niet geantwoord met gedetaileerde informatie"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3721,24 +3843,24 @@ msgstr "Kies een Contactafbeelding"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "De bestandsgrootte van afbeelding \"%s\" is te groot"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Het bestand mag niet groter zijn dan 32 kilobyte."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3746,7 +3868,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3754,38 +3876,38 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 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:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Persoonlijke Informatie"
@@ -3794,25 +3916,26 @@ msgstr "Persoonlijke Informatie"
 msgid "creating logs database"
 msgstr "logboek database wordt aangemaakt"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s is een bestand, maar een map werd verwacht"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim sluit nu af"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "map %s wordt aangemaakt"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s is een map, maar een bestand werd verwacht"
@@ -3834,39 +3957,39 @@ msgstr "D-Bus bevindt zich niet op deze machine of de python module ontbreekt"
 msgid "Session bus is not available"
 msgstr "Sessiebus is niet beschikbaar"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Gebruik DBus en Notification-Daemon om notificaties weer te geven"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Afwezig vanwege inactiviteit"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Niet beschikbaar vanwege inactiviteit"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Voeg * en [n] toe aan roster titel?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3874,12 +3997,12 @@ msgstr ""
 "Hoeveel regels te onthouden van het vorige gesprek zodra een gesprekstab of -"
 "venster heropend wordt."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3887,20 +4010,20 @@ msgstr ""
 "Stuur bericht na Ctrl+Enter en slechts Enter maakt een nieuwe regel "
 "(Standaard gedrag van Mirabilis ICQ)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Gebruik compacte weergave bij gespreksvensters"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr "Gebruik compacte weergave bij groepsgespreksvensters"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3909,18 +4032,22 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 "Vraag bevestiging voor het sluiten van een groepsgespreksvenster of -tab."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3928,23 +4055,23 @@ msgstr ""
 "Forceert de host die opgegeven wordt voor bestandsoverdrachten in het geval "
 "van een NAT of port forwarding."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Laat tabs zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Laat tab rand zien bij slechts één gesprek?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Laat sluit knop zien in tabs?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3952,7 +4079,7 @@ msgstr ""
 "Een puntkomma-onderbroken lijst van woorden die oplichten in een "
 "groepsgesprek"
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3960,11 +4087,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:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Indien Aan registreerd Gajim xmpp:// bij elke start."
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3972,7 +4099,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3980,7 +4107,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:168
+#: ../src/common/config.py:179
 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."
@@ -3988,8 +4115,8 @@ msgstr ""
 "Indien Aan zal Gajim contactafbeeldingen ophalen voor elk contact waarvan "
 "geen bekend is, of de laatste afbeelding te oud is."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3997,72 +4124,87 @@ msgstr ""
 "Indien Uit zullen geen statusberichten weergeven worden in gesprekken "
 "wanneer een contact zijn/haar status aanpassen."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Slapen"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Zo terug"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "In een paar minuten terug."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Eten"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Ik ben aan het eten, laat een bericht achter."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Ik been een film aan het kijken."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Werken"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Ik ben aan het werk."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefoon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Ik ben aan het telefoneren."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Uit"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Ik ben uit van het leven genieten"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4070,7 +4212,7 @@ msgstr ""
 "Geluid om af te spelen wanneer een MUC bericht je bijnaam of een van de "
 "woorden in much_highlight_words bevat."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4079,61 +4221,66 @@ msgstr ""
 "geldig als notify_on_all_muc_messages aan staat)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "groen"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "kruidenier"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "menselijk"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "simpel"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Niet in staat de ruimte binnen te gaan"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Een wachtwoord is vereist om deze ruimte binnen te komen."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Je bent uit deze ruimte verbannen."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Die ruimte bestaat niet."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Ruimte creatie is beperkt."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Je geregistreerde bijnaam moet gebruikt worden."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Je staat niet in de ledenlijst"
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4142,40 +4289,40 @@ msgstr ""
 "gebruiker.\n"
 "Geef een andere bijnaam op:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "we zijn nu op %s geabonneert"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "afmelding verzocht van %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "we zijn nu van %s afgemeld"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Verbinding met account \"%s\" verbroken"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4185,61 +4332,61 @@ msgstr ""
 "rooster. Gebruik een roostermanagement applicatie zoals http://jru."
 "jabberstudio.org/ om het te verwijderen"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kon geen verbinding maken met \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Verbonden met server %s:%s met %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Controleer je verbinding of probeer later nogmaals"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggen mislukt met \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 msgid "Please check your login and password for correctness."
 msgstr "Controleer gebruikersnaam en wachtwoord."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP wachtwoord niet opgegeven"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "onzichtbaar"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Ik ben %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Dit bericht is versleuteld]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4248,16 +4395,16 @@ msgstr ""
 "Onderwerp: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Een protocolfout is opgetreden:"
 
@@ -4379,10 +4526,6 @@ msgstr "Onz_ichtbaar"
 msgid "Invisible"
 msgstr "Onzichtbaar"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Niet in het rooster"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Onbekend"
@@ -4470,10 +4613,41 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "cyaan"
 
+#~ msgid "account: "
+#~ msgstr "account: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Weet je zeker dat je de ruimten \"%s\" wilt verlaten?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Als je dit venster sluit zal de verbinding verbroken worden met deze "
+#~ "ruimten."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr ""
+#~ "In-/Uitschakelen berichtgeving als een bestandsoverdracht voltooid is"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Verwijderen van geselecteerde bestandsoverdracht"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Stopt geselecteerde bestandsoverdracht"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Gebruik enkel gespreksvenster met _tabs"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Als je deze tab sluit en geschiedenis uitgeschakelt hebt zal dit bericht "
+#~ "verloren gaan."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kon laatste groep niet verwijderen"
 
diff --git a/po/no/LC_MESSAGES/gajim.po b/po/no/LC_MESSAGES/gajim.po
index 248c43ff588fe1378f59da0a99fcf89937c28ec4..63018743f5aa1c1891c2a75d30b9831756df84fb 100644
--- a/po/no/LC_MESSAGES/gajim.po
+++ b/po/no/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-08 14:28+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -20,9 +20,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "En GTK+ Jabber klient"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -52,39 +51,8 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Gjemt"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Samtale"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Gruppe Samtale"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "konto:"
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "ikke i kontaktliste"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Endre til %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -100,218 +68,372 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Tilkobling ikke tilgjengelig"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "ikke i kontaktliste"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Samtale"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Kryptering"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Kryptering påslått"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Kryptering avslått"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Du fikk akkurat en ny melding fra \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
+"mistet."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Hvert %s _minutt"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Hendelse"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Lyd"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "status melding tittel"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "status melding tekst"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP er ikke tilgjenglig på denne maskinen"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Du er for øyeblikket tilkoblet til serveren"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "For å endre konto navnet må du ikke være tilkoblet."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Ugyldig konto navn"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Konto navn kan ikke være tomt."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Konto navn kan ikke inneholde mellomrom."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Ugyldig innlegg"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Egendefinert port må være et port nummer"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Ingen slik konto tilgjengelig"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Klarte ikke å hente hemmelig nøkkel"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Passord setning"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Velg din OpenPGP nøkkel"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Navn"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Rediger %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registrer til %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Medlem"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Eier"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrator"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Kast ut"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Rolle:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Utvis %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Hva ønsker du å gjøre?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, 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:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, 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:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrator"
+
+#: ../src/config.py:1961
+#, 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:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nytt Rom"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Ugyldig brukernavn"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Du må oppgi et brukernavn for å konfigurere denne kontoen."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Du må skrive inn et passord for den nye kontoen"
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Kontoen har blitt lagt til uten feilmeldinger"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -320,23 +442,23 @@ msgstr ""
 "eller senere ved å klikke under Kontoer menyvalget, under Rediger menyen fra "
 "hovedvinduet."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Din nye konto har blitt opprettet uten feilmeldinger"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Det skjedde en feil ved oppretting av kontoen"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Konto navnet er i bruk"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Du har allerede en konto med dette navnet."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -344,48 +466,48 @@ msgstr ""
 "Tekst under denne linjen er hva som har blitt sagt siden sist du fulgte med "
 "i denne gruppe samtalen"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Ordbok URL mangler en \"%s\" og den må ikke være WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "I går"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i dager siden"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -411,12 +533,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transporter"
 
@@ -471,44 +593,67 @@ msgstr "Kontakten er allerede listet  i din kontaktliste."
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ Jabber klient"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Bli med i samtalegruppe med konto %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Ugyldig brukernavn"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Start samtale med konto %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Start Samtale"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -517,137 +662,154 @@ msgstr ""
 "Ã¥ sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Passordene du skriver inn i begge felt må være identiske."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt Logget PÃ¥"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Ny Melding"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Ny Privat Melding"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Fra %s i rom %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Fra %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Til %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Enslig Melding med konto %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Melding"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Du har blitt invitert til %(room_jid)s rommet av %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -694,11 +856,6 @@ msgstr "Denne typen tjeneste inneholder ingen elementer å utforske"
 msgid "Browsing %s"
 msgstr "Utforsking %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Utforsk"
@@ -707,30 +864,30 @@ msgstr "_Utforsk"
 msgid "This service does not contain any items to browse."
 msgstr "Denne tjenesten innholer ingen elementer å utforske."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanner %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Brukere"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Beskrivelse"
 
@@ -751,7 +908,7 @@ msgstr "Fremdrift"
 msgid "Filename: %s"
 msgstr "Filnavn: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Størrelse: %s"
@@ -767,8 +924,8 @@ msgstr "Du"
 msgid "Sender: %s"
 msgstr "Sender: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Mottaker: "
 
@@ -781,7 +938,7 @@ msgstr "Lagret i: %s"
 msgid "File transfer completed"
 msgstr "Fil overføring komplett"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Ã…pne Foreldre Katalog"
 
@@ -805,50 +962,55 @@ msgstr "Velg Fil for Sending..."
 msgid "Send"
 msgstr "Send"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim får ikke tilgang til filen"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Denne filen er i bruk av en annen prosess."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Denne filen finnes fra før"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Hva ønsker du å gjøre?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivelse: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s ønsker å sende deg en fil:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Lagre Fil som..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Denne filen finnes fra før"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -856,37 +1018,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Ugyldig Fil"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Fil: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Det er ikke mulig å sende tomme filer"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pause"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Fortsett"
 
@@ -1149,31 +1311,31 @@ msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim trenger en Xserver for å kjøre. Avslutter..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim trenger PyGTK 2.6 eller høyere"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim trenger GTK 2.6 eller høyere"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ mangler libglade støtte"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1182,83 +1344,83 @@ msgstr ""
 "Vennligst fjern din gjeldende GTK+ installasjon og installer siste stabile "
 "versjon fra %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, 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:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autentisering for %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "feil ved sending"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Du vil alltid se han eller henne som frakoblet."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard publisering vellykket"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Din personlige informasjon har blitt publisert uten feil."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1268,36 +1430,36 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Loggene ble migrert til databasen uten feil."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Vennligst vent mens loggene blir migrert..."
 
@@ -1318,149 +1480,100 @@ msgstr "Du kan ikke slette ditt gjeldene tema"
 msgid "Please first choose another for your current theme."
 msgstr "Vennligst velg en annen for ditt gjeldende tema."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
-
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
-"Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
 
-#. just in one room
-#: ../src/groupchat_window.py:155
-#, 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:79
+msgid "Sending private message failed"
+msgstr "Sending av privat melding feilet"
 
-#: ../src/groupchat_window.py:156
-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."
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
+#, 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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Ikke spør meg igjen"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Gruppe Samtale"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Dette rommet har ingen tittel"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blitt utvist: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s er blitt uønsket: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du er nå kjent som %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s er nå kjent som %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s har dratt"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s er nå %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Endrer Tittel"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Vennlist skriv inn ny tittel:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Endrer Kallenavn"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bokmerke allerede satt"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Rommet \"%s\" er allerede i dine bokmerker."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bokmerke har blitt lagt til"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan behandle bokmerkene dine fra Handlinger menyen i kontaktlisten."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Tilkobling ikke tilgjengelig"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Kallenavn ikke funnet: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, 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_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandoer: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1473,7 +1586,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1481,12 +1594,12 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn>, åpner en privat samtale vindu til den "
 "spesifiserte brukeren."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Bruksanvisning: /%s, tømmer tekst vinduet."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1495,12 +1608,12 @@ msgstr ""
 "Bruksanvisning: /%s [årsak], lukker gjeldende vindu eller fane, viser årsak "
 "dersom spesifisert."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1509,7 +1622,7 @@ msgstr ""
 "Bruksanvisning: /%s <JID> [Ã¥rsak], inviterer JID til gjeldende rom, og viser "
 "en årsak dersom spesifisert."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1518,7 +1631,7 @@ msgstr ""
 "Bruksanvisning: /%s <rom>@<server>[/kallenavn], inviterer til rom@server og "
 "gir mulighet for å spesifisere valgfritt kallenavn."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1529,7 +1642,7 @@ msgstr ""
 "kallenavn fra rommet og viser om spesifisert en årsak. Støtter ikke "
 "mellomrom i kallenavn."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1538,7 +1651,7 @@ msgstr ""
 "Bruksanvisning: /%s <handling>, sender handling til gjeldende rom. Bruk "
 "tredje person. (f.eks. /%s eksploderer.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1547,19 +1660,19 @@ msgstr ""
 "Bruksanvisning: /%s <kallenavn> [melding], åpner et privat meldingsvindu og "
 "sender meldingen til brukeren spesifisert av kallenavn."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 "Bruksanvisning: /%s <kallenavn>, endrer kallenavnet ditt i gjeldende rom."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1567,23 +1680,70 @@ msgstr ""
 "Bruksanvisning: /%s <melding>, sender en melding uten å se etter andre "
 "kommandoer."
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjelpe informasjon for /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Ikke spør meg igjen"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Endrer Tittel"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Vennlist skriv inn ny tittel:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Endrer Kallenavn"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Vennlist skriv det nye kallenavnet du ønsker å bruke:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Bokmerke allerede satt"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Rommet \"%s\" er allerede i dine bokmerker."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bokmerke har blitt lagt til"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
@@ -1742,42 +1902,38 @@ msgid "Accounts"
 msgstr "Kontoer"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Av_anserte Handlinger"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Legg til ny Kontakt"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Ny _Kontakt"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adresse"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avansert"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Avansert Konfigurasjons Editor"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Etter kallenavn:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Etter tid:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1787,62 +1943,62 @@ msgstr ""
 "Bare komponering \n"
 "Deaktivert"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Tillat _OS informasjon å bli sendt"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Tillat han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Også kjent som iChat stil"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Spør etter status melding når jeg:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Forespør hans/hennes status"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Spør:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Tilegn Open_PGP Nøkkel"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Auto _borte etter:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Auto _ikke tilgjengelig etter:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Auto bli med"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1854,71 +2010,71 @@ msgstr ""
 "Alltid bruk KDE standard applikasjoner\n"
 "Egendefinert"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automatisk godkjenn kontakt"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Koble til på nytt automatisk når kontakten mistes"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Før kallenavn:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Før tid:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Fødselsdag:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Fet"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Lag din egen spørring"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "K_oble til når Gajim starter"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Avbryt filoverføring"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter valgte filoverføring"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Avbryter valgte filoverføring og fjerner den uferdige filen"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "En_dre Passord"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Endre Passord"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Endre _Kallenavn"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Endre _Tema"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Samtale status opp_lysninger:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1928,7 +2084,7 @@ msgstr ""
 "Bruk med varsomhet, fordi det blokkerer alle meldinger fra lle kontakter som "
 "ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1940,211 +2096,212 @@ msgstr ""
 "standard dersom dette tilbys av servere, og med dette valget blir TLS "
 "deaktivert."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Velg _Nøkkel..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "By:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Rydd _opp"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Klikk for å forandre kontoens passord"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Klikk for å sette inn et uttrykksikon (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Klikk for å se tidligere samtaler i dette rommet"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Klikk for å se tidligere samtaler med denne kontakten"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Bedrift:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Konfigurer _Rom"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Koble til når jeg klikker Ferdig"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Tilkobling"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Kontaktinformasjon"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Kontakt_Info"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Samtale Historikk"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Standard _status ikonsamling:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Slett MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Slett Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Sletter Meling for Dagen"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Nekt"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Avdeling:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Viser kontaktikoner for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Vis status melding for kontakter i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Post:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Rediger Grupper"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Rediger Personlig Informasjon..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Rediger _Grupper"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Behandle Uttrykksikoner"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Slå på"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Skriv inn en gang til for verifisering:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Skriv inn nytt passord:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Hendelser"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Hvert 5 _minutt"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Ekstra Adresse:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Etternavn:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Fil Overføringer"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fil _Overføringer"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Fil behandler:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Font stil:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Forby han/henne å se min status"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Ofte Stilte Spørsmål (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "G_Ã¥"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim Tema Valg"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2152,7 +2309,7 @@ msgstr ""
 "Gajim kan sende og motta meta-informasjon relatert til en samtale du kan ha "
 "med en kontakt"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2160,7 +2317,7 @@ msgstr ""
 "Gajim vil autmatisk vise deg den nye meldingen i et samtalevindu eller fane "
 "i det eksisterende samtalevinduet"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2168,7 +2325,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at du har fått en ny melding"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2176,7 +2333,7 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget inn"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2184,71 +2341,71 @@ msgstr ""
 "Gajim vil alarmere deg med sprett-opp vindu i bunnen til høyre på skjermen "
 "om at en kontakt har akkurat logget ut"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajimvil bare endre ikonet til kontakten som har sendt den nye meldingen"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Konto Opprettings Veiviser"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Generelle"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Fornavn:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Gruppe:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP Connect"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Hjelp online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Lukker vinduet"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Hjemmeside:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Maskinnavn:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Jeg har allerede en konto jeg ønsker å bruke"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Jeg ønsker å _registrere en ny konto"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Dresom valgt vil Gajim ha et statusikon (trayicon)"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Dersom valgt vil Gajim vise ikonbilder for kontakter i kontaktliste vinduet"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2256,15 +2413,15 @@ msgstr ""
 "Dersom valg vil Gajim vise status melding til kontakter under kontakt navnet "
 "i kontaktliste vinduet."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Dersom valgt vil Gajim automatisk gå inn i gruppesamtalen ved oppstart"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Dersom valgt vil Gajim huske passordet for kontoen"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2272,7 +2429,7 @@ msgstr ""
 "Dersom valgt vil Gajim huske kontaktliste og samtalevindu posisjoner på "
 "skjermen, samt størrelsen på de til neste gang du åpner de"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2280,7 +2437,7 @@ msgstr ""
 "Dersom valgt vil Gajim bytte ut \"smilies\" som ':)' med grafiske "
 "uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2288,7 +2445,7 @@ msgstr ""
 "Dersom valgt vil Gajim sende hold-i-live pakker så man ikke får en "
 "frakobling på grunn av inaktivitet"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2296,7 +2453,7 @@ msgstr ""
 "Dersom valgt vil Gajim lagre passord i ~/.gajim/config med 'les' rettighet "
 "bare for deg"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2305,7 +2462,7 @@ msgstr ""
 "Dersom valgt vil Gajim bruke protkoll-spesifikke ikoner. (En kontakt fra MSN "
 "vil ha msn ikoner for status pålogget, borte, opptatt, osv...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2313,7 +2470,7 @@ msgstr ""
 "Dersom valgt, vil Gajim automatisk koble seg til jabber med denne kontoen "
 "ved oppstart"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2322,7 +2479,7 @@ msgstr ""
 "Dersom valgt vil endringer til global status (håndtert av kombomenyen "
 "nederst i kontaktvinduet) endre status på denne kontoen. "
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2330,167 +2487,180 @@ msgstr ""
 "Dersom du har 2 eller flere kontoer og denne er valgt, vil Gajim liste alle "
 "kontakter som om du hadde en konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Innkommende melding:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Informasjon/Spørring"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informasjon om deg, slik som den er lagret på serveren"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Invitasjon motatt"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Bli med i _Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Plassering"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Behandle Kontoer"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Behandle Bokmerker"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Behandle Uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Behandle Proxy Profiler"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Behandle..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Mellomnavn:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mod_ererer"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Kallenavn:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Alarmer meg om kontakter som:"
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "PÃ¥ hver _melding"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Send melding og lukk vinduet"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Ã…pne..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Kryptering"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Eller velg en forhåndsvalgt melding:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Utgående melding:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "Pass_ord:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Passord:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Personlig Informasjon"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefon Nummer:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Spill av _lyder"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port:"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Plassering:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Post Kode:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Tilstedeværelse"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Utskrifts tid:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priorit_et:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2500,63 +2670,59 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, Bilde"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Spørrings Bygger..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Nylig:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrer til:"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Fjern kontoe _bare fra Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Fjern konto fra Gajim og fra _serveren"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Fjern filoverføringen fra listen"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Fjern valgte filoverføring"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Svar på denne meldingen"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Tilbakestill til Standard Farger"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Ressu_rs:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2570,217 +2736,213 @@ msgstr ""
 "navn 'Hjeme' og 'Jobb' på samme tid. Ressursen med høyest prioritet vil få "
 "hendelsene. (se under)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Ressurs:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Rolle:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Rom Instillinger"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Rom:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Lagre _passord setning (usikkert)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Lagre _posisjon og størrelse for kontaktliste og samtalevinduer"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Lagre samtale _logger for alle kontakter"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Lagre pass_ord"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Søk"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Sen_d"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Send Fil"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Send _Melding"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Send _Fil"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Send _Ny Melding..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Send hold-i-live meldinger"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Send melding"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Send melding og lukk vinduet"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Server Funksjonalitet"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Velg MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Velg Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Velg _Avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Velg et ikonbilde (avatar) når jeg kobler til"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Setter Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Vis Alle _Handlinger som Venter"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Vis _Frakoblede Kontakter"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Vis _Kontaktliste"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Vis _XML Konsoll"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Vis bare i _kontaktliste"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "Logger _inn"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "Logger _ut"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Sorter kontakter etter status"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Start _Samtale"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Fylke:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Status melding:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Stopp valgte filoverføring"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Gate:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Abbonerings Forespørsel"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Abbonement:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Suffix:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_roniser konto status med global status"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Tekst _farge:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Tekst _font:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Den automatiserte borte meldinen"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Den autmatiserte ikke tilgjengelig meldingen"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2788,79 +2950,75 @@ msgstr ""
 "Dette valget fjerner en filoverføring fra listen. Dersom den er aktiv vil "
 "den først bli stoppet og så fjernet."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Tittel:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Til:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Endre Open_PGP Kryptering"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Skriv inn din nye status melding:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Skriv:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Strek Under"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Oppdater MFD (MOTD)"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Oppdater Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Uppdaterer Melding for Dagen"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Bruk _SSL (gammel)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Bruk _uttrykksikoner"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Bruk _transportenes ikoner"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Bruk et enkelt samtalevindu med _faner"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Bruk autentisering"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Bruk egendefinert maskinnavn/port"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Bruker ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2872,15 +3030,15 @@ msgstr ""
 "bare skje dersom du får en ny melding fra en kontakt du ikke er i samtale "
 "med."
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "NÃ¥r en ny hendelse blir motatt"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Jobb"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2888,346 +3046,346 @@ msgstr ""
 "Du trenger en konto før du kan koble\n"
 "til Jabber nettverket."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Din JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Handlinger"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Legg til Kontakt..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Legg til Kontaktliste"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adresse:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avansert"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Godkjenn"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Bakgrunn:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Utvis"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Lag _Bokmerke til Rommet"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Nettleser:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt Utseende    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Innhold"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopier JID/E-post Adresse"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Kopier Link PLassering"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Nekt"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Oppdag Tjenester..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikon i systemstatusfelt (også kjent som systray)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Bli med i Nytt Rom"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Kast ut"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Logg samtale historikk"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Logg status endringer til kontakter"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Post klient:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Slå sammen kontoer"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Melding"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Endre"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Rediger Konto..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Navn:"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Aldri"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Gi meg beskjed om det"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Gi meg beskjed når filoverføring er komplett"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Beboer Handling"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Online Brukere"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Ã…pne ny Epost"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Ã…pne Link i Nettleser"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Eier"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Passord:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pause"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Spiller:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Sprett opp"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Instillinger"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Tilstedeværelse"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publisér"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Gi Nytt Navn"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Svar"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Hent"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Søk"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Send"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Send & Lukk"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Send Privat Melding"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Send Server Melding"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Send Melding"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Velg Bilde..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Start Samtale"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Abbonér"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Abonement"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Bruk proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Brukernavn:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Stemme"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML Konsoll..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "fil overførings liste"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutter"
 
@@ -3237,17 +3395,17 @@ msgstr "minutter"
 msgid "Error: cannot open %s for reading"
 msgstr "Feil: kan ikke åpne %s for lesing"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Feil under lesing av fil:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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."
@@ -3285,92 +3443,102 @@ msgstr "Status er nå: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status er nå: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Endre til %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s har sendt deg en ny melding."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s ønsker å sende deg en fil."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Du har vellykket motatt %(filename)s fra %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Fil overføring av %(filename)s fra %(name)s stoppet."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Du har vellykket sendt %(filename)s til %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, 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/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Samlede kontoer"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Bli med i Nytt Rom"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "bruker kontoen %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3378,69 +3546,69 @@ msgstr ""
 "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra denne "
 "transporten."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Gi _nytt navn"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "NÃ¥ vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "NÃ¥ vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3448,28 +3616,28 @@ 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3477,19 +3645,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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3497,183 +3665,137 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Endre Status Melding..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "bruker konto"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Gjem dette vinduet"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s har ikke sendt en OpenPGP nøkkel og du har ikke tilegnet en"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Du fikk akkurat en ny melding fra \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
-"mistet."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Dersom du lukke denne fanen og du har slått av historikk, vil meldingen bli "
-"borte."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Sending av privat melding feilet"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Du er ikke lenger i rommet \"%s\" eller \"%s\" har dratt."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Kryptering påslått"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Kryptering avslått"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Overfører"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Denne tjenesten har ikke enda svart med detaljert informasjon"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3687,24 +3809,24 @@ msgstr "Velg Bilde"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Filstørrelsen på bilde \"%s\" er for stor"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Filen må ikke være mer enn 32 kilobyte."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3712,7 +3834,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3720,13 +3842,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3734,23 +3856,23 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Personlig Informasjon"
@@ -3759,25 +3881,26 @@ msgstr "Personlig Informasjon"
 msgid "creating logs database"
 msgstr "lager logg database"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s er en fil men skulle ha vært en katalog"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim vill nå lukkes"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "lager %s mappe"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s er en katalog men skulle vært en fil"
@@ -3800,38 +3923,38 @@ msgstr "D-Bus finnes ikke på denne maskinen eller python modulen mangler"
 msgid "Session bus is not available"
 msgstr "Sesjons buss ikke tilgjengelig"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Bruk DBus og Hendelses-Tjenesten for å vise hendelser"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Borte på grunn av inaktivitet"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Legg * og [n] inn i kontaktliste tittelen?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3839,12 +3962,12 @@ msgstr ""
 "Hvor mange linjer skal huskes fra forrige samtale når et samtale vindu/fane "
 "blir åpnet på nytt."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3852,20 +3975,20 @@ msgstr ""
 "Send meldinger med Ctrl+Enter og med Enter lag ny linje (Mirabilis ICQ "
 "Klient standard oppførsel)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3874,17 +3997,21 @@ msgstr ""
 "Enten bruk egendefinert url med %s i seg hvor %s er ordet/frasen eller "
 "'WIKTIONARY' som betyr bruk wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Spør før lukking av gruppesamtale fane/vindu."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3892,29 +4019,29 @@ msgstr ""
 "Overstyrer maskinen navnet vi sender for Fil Overføring i tilfeller med "
 "adresse oversetting/port videresending."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC standard sier KiB = 1024 bytes, KB = 1000 bytes."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Vis fane når du har bare en samtale?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Vis fane felt ved bare en aktiv samtale?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Vis lukk knapp på fanen?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 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:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3922,11 +4049,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3934,7 +4061,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3942,7 +4069,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:168
+#: ../src/common/config.py:179
 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."
@@ -3950,8 +4077,8 @@ msgstr ""
 "Dersom True vil Gajim spør etter ikonbilde for hver kontakt som ikke hadde "
 "et ikonbilde sist gang eller har en lagret som er for gammel."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3959,72 +4086,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4032,7 +4174,7 @@ msgstr ""
 "Lyd som spilles når en MUC melding inneholder et av ordene i "
 "muc_highlight_words, eller når en MUC melding inneholder ditt kallenavn."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4041,61 +4183,66 @@ msgstr ""
 "aktiv når notify_on_all_muc_messages er True)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "grønn"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "varehandel"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "menneskelig"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "enkel"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Klarer ikke å gå inn i gruppesamtale"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Et passord kreves for å bli med i dette samtalerommet."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Du er uønsket i dette rommet."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Et slikt rom finnes ikke."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Rom oppretting er begrenset."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Ditt registrerte kallenavn må bli brukt. "
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Du er ikke medlems listen."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4104,38 +4251,38 @@ msgstr ""
 "samtalebruker.\n"
 "Vennligst skriv et annet kallenavn under:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi abbonerer nå på %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "frakoblings ønske fra %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi abbonerer ikke lenger på %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4145,61 +4292,61 @@ msgstr ""
 "Bruk kontaktliste administrasjons verktøy som http://jru.jabberstudio.org/ "
 "for å fjerne den"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Tilkoblet til server %s:%s med %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "usynlig"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4208,16 +4355,16 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Tidsavbrudd"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "En protokoll feil har skjedd:"
 
@@ -4339,10 +4486,6 @@ msgstr "_Usynlig"
 msgid "Invisible"
 msgstr "Usynlig"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Ikke i kontaktlisten"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact has status:Ukjent"
@@ -4430,10 +4573,39 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "turkis"
 
+#~ msgid "account: "
+#~ msgstr "konto:"
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Er du sikker på at du vil gå ut av rommene \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Dersom du lukker dette vinduet, så vil du bli frakoblet fra disse rommene."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Aktiver/Deaktiver melding om at filoverføring er komplett"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Fjern valgte filoverføring"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Stopp valgte filoverføring"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Bruk et enkelt samtalevindu med _faner"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Dersom du lukke denne fanen og du har slått av historikk, vil meldingen "
+#~ "bli borte."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan ikke fjerne den siste gruppen"
 
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index 8ac520b83b10a080ac566a9ad8245d8a3eceff0d..412de551fa9b003af8a4db03a0e1b05639ec70f7 100644
--- a/po/pl/LC_MESSAGES/gajim.po
+++ b/po/pl/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\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"
@@ -24,9 +24,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Klient Jabbera w GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -56,39 +55,8 @@ msgstr "(Brak)"
 msgid "Hidden"
 msgstr "Ukryte"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Rozmowa"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Pokój"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "konto: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "spoza listy kontaktów"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Zmień na %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -104,219 +72,375 @@ msgstr ""
 "\n"
 "Podświedlanie błędów w pisowni nie będzie używane"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Połączenie jest niemożliwe"
+
+#: ../src/chat_control.py:302
+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."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "spoza listy kontaktów"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Rozmowa"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Szyfrowanie OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Szyfrowanie włączone"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Szyfrowanie wyłączone"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, 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:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
+"utracisz tę wiadomość."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Co %s _minut(y)"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktywny"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Zdarzenie"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Dźwięk"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "nagłówek informacji o statusie"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "treść informacji o statusie"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "Nie można używać OpenPGP na tym komputerze"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Jesteś połączony z serwerem"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Aby zmienić nazwę konta, musisz być rozłączony."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Niepoprawna nazwa konta"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Nazwa konta nie może być pusta."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Nazwa konta nie może zawierać spacji."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Niepoprawny Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Niepoprawny wpis"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Wybrany port musi być numerem portu."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Takie konto nie jest dostępne"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Pobieranie kluczy prywatnych nie powiodło się"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr ""
 "Wystąpił problem w trakcie odzyskiwania Twoich kluczy prywatnych OpenPGP."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Hasło"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Wybierz klucz OpenPGP"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Serwer"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Modyfikuj %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Zarejestruj na %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Uczestnik"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Właściciel"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrator"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "Wy_rzuć"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Funkcja:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Zabanuj %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Co chcesz zrobić?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Co chcesz zrobić?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Co chcesz zrobić?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrator"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Co chcesz zrobić?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Tekst"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Obrazek"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nowy pokój"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Niepoprawna nazwa użytkownika"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Musisz wpisać nazwę użytkownika aby skonfigurować to konto."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Musisz wpisać hasło dla nowego konta."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Konto zostało pomyślnie dodane"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -324,23 +448,23 @@ 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:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Twoje konto zostało założone"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Wystąpił błąd w trakcie tworzenia konta."
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Nazwa konta jest już zajęta"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Masz już konto o takiej nazwie."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -348,48 +472,48 @@ msgstr ""
 "Tekst poniżej tej linii zawiera to, co zostało napisane w tym pokoju od "
 "momentu gdy ostatni raz zwracałeś/zwracałaś na niego uwagę."
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Działania dla wyrażenia \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "W URL-u słownika brakuje \"%s\" i nie jest to WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Wczoraj"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i dni temu"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -415,12 +539,12 @@ msgstr "JID : <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transporty"
 
@@ -474,44 +598,67 @@ msgstr "Ten kontakt znajduje się już na twojej liście kontaktów."
 msgid "A GTK+ jabber client"
 msgstr "Klient jabbera w GTK+."
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Tłumaczenie na język polski: Witold Kieraś <pambuk@gmail.com>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Dołącz do pokoju z konta %s."
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Niepoprawna nazwa użytkownika"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Rozpocznij rozmowÄ™ z konta %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Rozpocznij rozmowÄ™"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -520,137 +667,155 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 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:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Wyślij prywatną wiadomość"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Od %s w pokoju %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Do %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "Masz nieprzeczytane wiadomości"
+msgstr[1] "Masz nieprzeczytane wiadomości"
+msgstr[2] "Masz nieprzeczytane wiadomości"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "wiadomość z konta %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napisał:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Otrzymałeś zaproszenie do pokoju%(room_jid)s od %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
@@ -697,11 +862,6 @@ msgstr "Tego typu usługa nie zawiera elementów, które można przeglądać."
 msgid "Browsing %s"
 msgstr "PrzeglÄ…danie %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "Prze_glÄ…daj"
@@ -710,30 +870,30 @@ msgstr "Prze_glÄ…daj"
 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:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Skanowanie %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Użytkownicy"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Opis"
 
@@ -754,7 +914,7 @@ msgstr "Postęp"
 msgid "Filename: %s"
 msgstr "Nazwa pliku: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Rozmiar: %s"
@@ -770,8 +930,8 @@ msgstr "Ty"
 msgid "Sender: %s"
 msgstr "Nadawca: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
@@ -784,7 +944,7 @@ msgstr "Zapisane w: %s"
 msgid "File transfer completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Otwórz katalog zawierający ten plik."
 
@@ -808,50 +968,55 @@ msgstr "Wybierz plik do wysłania..."
 msgid "Send"
 msgstr "Wyślij"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim nie ma dostępu do tego pliku"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Ten plik jest używany przez inny proces."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Ten plik już istnieje"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Co chcesz zrobić?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Plik: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Opis: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s chce przesłać Ci plik:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Zapisz plik jako..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Ten plik już istnieje"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -859,37 +1024,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/ów)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Niepoprawny plik"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Plik: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Nie można wysłać pustego pliku"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Zatrzymaj"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Kontynuuj"
 
@@ -1150,32 +1315,32 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji."
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim wymaga do działania serwera X. Zakończenie..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim wymaga PyGTK w wersji 1.6 lub wyższej"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim wymaga GTK w wersji 2.6 lub wyższej"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "W GTK+ brakuje wsparcia dla libglade"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1183,84 +1348,84 @@ msgid ""
 msgstr ""
 "Proszę usunąć obecną wersje GTK+ i zainstalować najnowszą stabilną wesję z %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, 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:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autoryzacja HTTP (%s) dla %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "błąd przy wysyłaniu"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnÄ…Å‚ Ci autoryzacjÄ™"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ma teraz status %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne."
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "Publikacja vCard powiodła się"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Informacje o tobie zostały opublikowane."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1270,35 +1435,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji."
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Logi zostały przeniesione do bazy danych."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 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:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Przenoszenie Logów..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Proszę poczekać na przeniesienie logów..."
 
@@ -1319,149 +1484,100 @@ msgstr "Nie możesz skasować obecnie używanego motywu"
 msgid "Please first choose another for your current theme."
 msgstr "Ustaw najpierw inny motyw"
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Czy jesteś pewien, że chcesz opuścić pokoje \"%s\"?"
-
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
-"Jeśli zamkniesz to okno, to połączenie z tymi pokojami zostanie zerwane."
 
-#. just in one room
-#: ../src/groupchat_window.py:155
-#, 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:79
+msgid "Sending private message failed"
+msgstr "Wysyłanie prywatnej wiadomości nie powiodło się."
 
-#: ../src/groupchat_window.py:156
-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."
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
+#, 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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Nie pytaj mnie o to ponownie."
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Pokój"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Ten pokój nie ma tematu"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s został wyrzucony: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s został zabanowany: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Występujesz teraz jako %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s występuje teraz jako %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s wychodzi"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s ma teraz status %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Zmiana tematu"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Wpisz nowy temat:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Zmiana pseudonimu"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Zakładka została już dodana"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Zakładka została dodana"
-
-#: ../src/groupchat_window.py:601
-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."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Połączenie jest niemożliwe"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-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/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Pseudonim nie został odnaleziony: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nie wyglÄ…da na poprawny JID"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Polecenia: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1473,18 +1589,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, 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_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Użycie: /%s czyście okno tekstowe."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1493,12 +1609,12 @@ msgstr ""
 "Użycie: /%s [powód] zamyka aktualne okno lub kartę i wyświetla powóc, jeśli "
 "został podany."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1507,7 +1623,7 @@ msgstr ""
 "Użycie: /%s <JID> [powód] zaprasza JID do aktualnego pokoju, opcjonalnie "
 "wyświetlając powód."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1516,7 +1632,7 @@ msgstr ""
 "Użycie: /%s <pokój>@<serwer>[/pseudonim] oferuje przyłączenie się do "
 "pokój@serwer opcjonalnie z wykorzystaniem podanego psedonimu."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1526,7 +1642,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_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1535,7 +1651,7 @@ msgstr ""
 "Użycie: /%s <działanie> wysyła działanie do aktualnego pokoju. Używaj w "
 "trzeciej osobie (np. /%s eksploduje.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1544,40 +1660,87 @@ msgstr ""
 "Użycie: /%s <pseudonim> [wiadomość] otwiera okno prywatnej wiadomości i "
 "wysyła ją do osoby o takim pseudonimie"
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Brak informacji o pomocy dla /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Nie pytaj mnie o to ponownie."
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Zmiana tematu"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Wpisz nowy temat:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Zmiana pseudonimu"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Wpisz nowy pseudonim, którego chcesz używać:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Zakładka została już dodana"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Pokój \"%s\" jest już w Twoich zakładkach."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Zakładka została dodana"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynÄ™:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
@@ -1736,42 +1899,38 @@ msgid "Accounts"
 msgstr "Konta"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Włącz/Wyłącz powiadomienie o zakończeniu przesyłania pliku."
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Z_aawansowane działania"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Dodaj nowy kontakt"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Dodaj _kontakt"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adres"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Edytor zaawansowanych ustawień"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Za pseudonimem:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Po czasie:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1781,63 +1940,63 @@ msgstr ""
 "Tylko dotyczÄ…ce pisania\n"
 "Wyłączone"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Zezwól na wysyłanie informacji o systemie _operacyjnym"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Pozwól mu/jej widzieć swój status"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Znany także jako styl iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Pytaj o opis przy zmianie statusu na:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Poproś o to, żeby móc widzieć jego/jej status"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Pytaj:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Przypisz klucz Open_PGP"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Automatyczny status '_Zaraz wracam' po:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automatyczny status '_Nieobecny' po:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Połącz automatycznie"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1849,71 +2008,71 @@ msgstr ""
 "Zawsze używaj domyślnych aplikacji KDE\n"
 "WÅ‚asne"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automatycznie autoryzuj kontakt"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatyczne połączenie po utracie łączności"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Przed pseudonimem:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Przed czasem:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Urodziny:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Wytłuszczone"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Stwórz własne zapytanie"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "P_ołącz przy starcie programu"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Usuwa transfer pliku"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Usuwa wybrany transfer pliku"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Usuwa wybrany transfer pliku i usuwa niedokończony plik"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Z_mień Hasło"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Zmień hasło"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Zmień pseudo_nim"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Zmień _temat"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Powiadomienia o stanie _rozmowy:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1923,7 +2082,7 @@ msgstr ""
 "wiadomościami. Stosuj ją ostrożnie, ponieważ powoduje ona blokowanie "
 "wszystkich wiadomości osób, których nie masz na liście kontaktów."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1934,220 +2093,221 @@ msgstr ""
 "serwerów udostępnia usługę SSL. Gajim używa szyfrowania TLS domyślnie, jeśli "
 "tylko serwer daje taką możliwość. Ta opcja wyłącza TLS."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Wybierz _Klucz..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Miasto:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "P_osprzÄ…taj"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Kliknij, aby zmienić hasło dla konta"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknij by wstawić emotikonę (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy ICQ)"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy w tym pokoju"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Kliknij by zobaczyć poprzednie rozmowy z tym kontaktem"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Firma:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Konfiguruj _pokój"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Połącz po wciśnięciu przycisku Zakończ"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Połączenie"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Informacje o kontakcie"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Informacje o kontakcie"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Historia rozmowy"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Kraj:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Domyślny zestaw ikon _statusu:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Usuń MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Usuń Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Usuwa Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Odmów"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Dział:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Wyświetlaj awatary kontaktów z listy"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Wyświetlaj opisy stutusu kontaktu na liście kontaktów"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "Adres e-mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Edytuj Grupy"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Zmień informacje o sobie..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Modyfikuj _grupy"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "ZarzÄ…dzaj emotikonami"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "WÅ‚Ä…cz"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Wpisz ponownie nowe hasło:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Wpisz nowe hasło:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Co 5 _minut"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Dodatkowy adres:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Nazwisko:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Przesyłane pliki."
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Przesyłanie plików"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Menadżer plików:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtr:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Styl czcionki:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Czcionka:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Zabroń mu/jej widzieć twój status"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: RRRR-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Najczęściej Zadawane Pytania (w sieci)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "I_dź"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Wybieranie motywów dla Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 msgstr ""
 "Gajim może wysyłać i odbierać meta-infomacje związane z prowadzoną rozmową"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2155,7 +2315,7 @@ msgstr ""
 "Gajim automatycznie wyświetli nową wiadomość w nowym oknie lub w nowej "
 "karcie otwartego okna rozmowy."
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2163,7 +2323,7 @@ msgstr ""
 "Gajim powiadomi Cię o nadejściu nowej wiadomości wyświetlając okienko w "
 "prawym dolnym rogu ekranu."
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2171,7 +2331,7 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach, które zmieniają status na Dostępny."
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2179,70 +2339,70 @@ msgstr ""
 "Gajim powiadomi automatycznie przy pomocy okna w prawym dolnym rogu o "
 "kontaktach które zmieniają status na Rozłączony."
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim zmieni jedynie ikonę kontaktu, który przysłał nową wiadomość."
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kreator Konta"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Ogólne"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "ImiÄ™:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Grupa:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Połączenie HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Pomoc w sieci"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Ukrywa okno"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Nazwa hosta: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Mam już konto i chcę z niego korzystać."
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Chcę za_rejestrować nowe konto Jabbera."
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Zaznaczenie spowoduje włączenie ikony Gajima w tacce systemowej."
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Zaznaczenie tej opcji spowoduje wyświetlanie awatarów w oknie listy kontaktów"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2250,15 +2410,15 @@ msgstr ""
 "Jeśli jest zaznaczone, Gajim będzie wyświetlał opis statusu kontaktu pod "
 "jego nazwą na liście kontaktów."
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Zaznaczenie spowoduje Å‚Ä…czenie z tym pokojem przy starcie programu"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Włączenie tej opcji spowoduje zapamiętanie hasła dla tego konta."
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2266,7 +2426,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zapamiętanie położenia głównego okna "
 "programu na ekranie oraz jego rozmiaru."
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2274,7 +2434,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje zastÄ…pienie emotikon tekstowych jak ':)' "
 "emotikonami graficznymi."
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2282,7 +2442,7 @@ msgstr ""
 "Zaznaczenie tej opcji spowoduje wysyłanie pakietów podtrzymujących "
 "połączenie, co zapobiega rozłączaniu."
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2290,7 +2450,7 @@ msgstr ""
 "Zaznaczanie tej opcji spowoduje przechowywanie hasła w pliku ~/.gajim/config "
 "z prawem do odczytu tylko dla ciebie"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2300,7 +2460,7 @@ msgstr ""
 "transportu, np. kontakt z MSN będzie miał odpowiednie ikony statusu "
 "dostępny, zaraz wracam, zajęty, itd."
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2308,7 +2468,7 @@ msgstr ""
 "Zaznaczanie tej opcji spowoduje automatyczne Å‚Ä…czenie z sieciÄ… Jabber z "
 "wykorzystaniem tego konta."
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2317,7 +2477,7 @@ msgstr ""
 "Jeśli jest zaznaczone, to każda zmiana statusu globalnego (ustawianego z "
 "menu na dole okna listy kontaktów) wpłynie odpowiednio na stutus tego konta."
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2325,167 +2485,180 @@ msgstr ""
 "Jeśli masz dwa konta lub więcej, to dzięki tej opcji Gajim pokaże wszystkie "
 "kontakty w taki sposób, jakby było to jedno konto."
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Wiadomość otrzymana:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Informacje/Zapytanie"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informacje o Tobie, takie jakie sÄ… przechowywane na serwerze"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Zaproszenie Odebrane"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Kursywa"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Dołącz do _pokoju"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Miejsce"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "ZarzÄ…dzaj kontami"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Zarządzaj zakładkami"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "ZarzÄ…dzaj emotikonami"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Zarządzaj profilami pośrednika"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "ZarzÄ…dzaj..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Drugie imiÄ™:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Więcej"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Pseudonim:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Żaden"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Powiadom mnie o kontaktach zmieniajÄ…cych status na: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "System operacyjny:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "W każdej _wiadomości"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Wyślij wiadomość i zamknij okno"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Otwórz..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Szyfrowanie OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Albo wybierz opis zapisany:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Wiadomość wysłana:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Hasło:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Informacje osobiste"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefon:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Odtwórz _dźwięk"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Stanowisko:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Kod pocztowy:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Ustawienia"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefiks:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Wyświetlaj czas:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priory_tet:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -2495,63 +2668,59 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, Awatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokół:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Pośrednik:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Kreator zapytań..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Ostatnio:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Zarejestruj w"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Usuń konto _tylko z Gajima"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Usuń konto z Gajima i z _serwera"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Usuń przesyłanie tego pliku z listy."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Usuwanie wybranego transferu pliku"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Odpowiedz na tę wiadomość"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Wróć do kolorów domyślnych"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Za_soby: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2565,217 +2734,213 @@ msgstr ""
 "'Dom' i 'Praca' w tym samym czasie. Klient o najwyższym będzie odbierał "
 "wiadomości. (patrz niżej)."
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Zasoby:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Funkcja:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Konfiguracja pokoju"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Pokój:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Zapisz _hasło (nie jest to bezpieczne)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Zapisz _logi rozmów dla wszystkich kontaktów"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Zapisz _hasło"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Szukaj"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Wyślij"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Wyślij plik"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Wyślij _wiadomość"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Wyślij _plik"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Wyślij _Nową Wiadomość..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Wysyłaj pakiety podtrzymujące"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Wyślij wiadomość"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Wyślij wiadomość i zamknij okno"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Serwer:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Możliwości serwerów"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Ustaw MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Ustaw Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Ustaw _Awatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Ustaw awatar po połączeniu"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Ustawia Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Pokaż wszystkie oczekujące _zdarzenia"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Pokaż kontakty niep_ołączone"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Pokaż _listę kontaktów"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Pokaż Konsolę _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Pokaż tylko _listę kontaktów"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Połączony"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "R_ozłączony"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Sortuj kontakty wydług statusu"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Rozpocznij _rozmowÄ™"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Stan/Województwo:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Informacja o statusie:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Zatrzymanie wybranego transferu pliku"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Temat:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Prośba o autoryzację"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Autoryzacja:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Sufiks:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synch_ronizuj status konta z globalnym statusem"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Kolor tekstu:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Czcionka tekstu:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Automatyczny status \"Zaraz wracam\""
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Automatyczny status \"Nieobecny\"."
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Motyw:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2783,79 +2948,75 @@ msgstr ""
 "To działanie spowoduje usunięcie przesyłu pliku z listy. Jeśli jest on "
 "aktywnyto najpierw zostanie zatrzymany a dopiero potem usunięty."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Do:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Włącz/wyłącz szyfrowanie Open_PGP"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Wpisz nowy opis statusu:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Podkreślenie"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Ukatualnij MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Uktualnij Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Uaktualnia Wiadomość Dnia"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Korzystaj z _SSL"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Używaj _emotikon"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Używaj zestawów ikon _transportów"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Używaj jednego okna rozmowy z kar_tami"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Używaj autoryzacji"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Użyj własnej nazwy hosta/portu"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Identyfikator użytkownika:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2867,15 +3028,15 @@ msgstr ""
 "pojawia się jeśli jest wiadomością od osoby, z którą aktualnie nie "
 "rozmawiasz."
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Gdy odebrane zostanie nowe zdarzenie"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Praca"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2883,346 +3044,346 @@ msgstr ""
 "Musisz posiadać konto aby połączyć się\n"
 " z sieciÄ… Jabber."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Twój JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "Dzi_ałania"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "Dod_aj kontakt..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "Dod_aj do listy kontaktów"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adres:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrator"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "Z_aawansowane"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autoryzuj"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_TÅ‚o:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "Za_banuj"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Dodaj _zakładkę dla tego pokoju"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "Prze_glÄ…darka:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "Widok _zwarty    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Zawartość"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiuj JID/Adres e-mail"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Kopiuj adres odnośnika"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "O_dmów"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Wyszukuj Usługi"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Wyszukuj Usługi..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Pokój"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historia"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikona w tacce systemowej"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Dołącz do Nowego pokoju..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "Wy_rzuć"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Zapisuj historiÄ™ rozmowy"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Zapisuj w logach zmiany statusów kontaktów"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "Klient _poczty:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Uczestnik"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Połącz konta"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "Wiado_mość"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modyfikuj"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Modyfikuj Konto..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Nazwa: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "Powia_dom mnie o tym"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Powiadom mnie gdy przesyłanie pliku dobiegnie końca."
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "Działania użytk_ownika"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "D_ostępni użytkownicy"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Otwórz Klienta Poczty"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Otwórz Link w przeglądarce"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Właściciel"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Hasło:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Zatrzymaj"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Program odtwarzający dźwięk:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Wyświetl"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Ustawienia"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Obecność"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publikuj"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Usuń"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Usuń z listy kontaktów"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Odpowiedz"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Przywróć"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Szukaj"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Wyślij"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Wyślij i Zamknij"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Wyślij prywatną wiadomość"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Wyślij wiadomość do serwera"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Wyślij wiadomość"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "U_staw obrazek..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Rozpocznij rozmowÄ™"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Autoryzuj"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Autoryzacja"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Korzystaj z pośrednika"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Nazwa użytkownika:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_GÅ‚os"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Konsola _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "Lista przesyłanych plików"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutach"
 
@@ -3232,17 +3393,17 @@ msgstr "minutach"
 msgid "Error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "BÅ‚Ä…d odczytu pliku:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3281,92 +3442,102 @@ msgstr "Obecny status: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Obecny status: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Zmień na %s"
+
+#: ../src/notify.py:145
 #, 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ść."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s przesłał ci nową wiadomość."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce przesłać ci plik."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Otrzymałeś plik %(filename)s od %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, 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/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Przesłałeś plik %(filename)s do %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, 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/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Połączone konta"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Serwer"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Dołącz do Nowego Pokoju"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Zarządzaj zakładkami..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3374,69 +3545,69 @@ msgstr ""
 "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów za pomocą "
 "tego transportu."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "_Zmień nazwę"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Zmień Opis Statusu"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana."
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, 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:1420
+#: ../src/roster_window.py:1438
 #, 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:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3444,28 +3615,28 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako Rozłączonego."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Wpisz hasło GPG dla konta %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz siÄ™ w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3473,19 +3644,19 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3493,31 +3664,31 @@ msgstr ""
 "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
 "historii."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Zmień Opis Statusu..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Zmień Opis Statusu..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "używając konta "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Ukryj to menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3525,55 +3696,7 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"Ani %s nie przesyła swojego klucza OpenPGP ani Ty nie przypisałeś mu żadnego "
-"klucza."
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Właśnie otrzymałeś nową wiadomość od \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
-"utracisz tę wiadomość."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Jeśłi zamkniesz tę kartę, a nie masz auktywnionej opcji historii, to "
-"utracisz tę wiadomość."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Wysyłanie prywatnej wiadomości nie powiodło się."
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Nie jesteś już w pokoju \"%s\" lub \"%s\" wyszedł."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Szyfrowanie włączone"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Szyfrowanie wyłączone"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3581,7 +3704,7 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3589,7 +3712,7 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:285
+#: ../src/tooltips.py:284
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3597,86 +3720,86 @@ msgstr[0] "Gajim - %s nieprzeczytana wiadomość"
 msgstr[1] "Gajim - %s nieprzeczytane wiadomości"
 msgstr[2] "Gajim - %s nieprzeczytane wiadomości"
 
-#: ../src/tooltips.py:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Funkcja: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Afiliacja: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Rozmiar: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Zatrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Przesyłanie"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 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:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3690,24 +3813,24 @@ msgstr "Wybierz awatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Rozmiar pliku obrazka \"%s\" jest za duży"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Ten plik nie może mieć więcej niż 32 kilobajty."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3715,7 +3838,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz siÄ™ jego/jej statusem."
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3723,12 +3846,12 @@ msgstr ""
 "JesteÅ› zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3736,23 +3859,23 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Informacje osobiste"
@@ -3761,25 +3884,26 @@ msgstr "Informacje osobiste"
 msgid "creating logs database"
 msgstr "tworzenie bazy danych z logami"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s jest plikiem choć powinien być katalogiem"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim zakończy teraz działanie"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "tworzenie katalogu %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s jest katalogiem choć powinien być plikiem"
@@ -3802,40 +3926,40 @@ msgstr "D-Bus nie jest obecny na tej maszynie lub brak modułu dla pythona"
 msgid "Session bus is not available"
 msgstr "Magistrala sesji nie jest dosŧępna"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Korzystaj z DBus i Demona Powiadomień aby wyświetlać powiadomienia"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Status Zaraz wracam z powodu bezczynności programu"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Status Nieobecny z powodu bezczynności programu"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Dodać * i [n] do tytułu listy kontaktów?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3843,11 +3967,11 @@ msgstr ""
 "Ile linii z poprzedniej rozmowy powinno zostać zapamiętanych gdy okno/karta "
 "rozmowy zostanie ponownie otwarta."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3855,20 +3979,20 @@ msgstr ""
 "Kombinacja Ctrl+Enter wysyła wiadomość a Enter tworzy nową linię (domyślne "
 "zachowanie klienta Mirabilis ICQ)."
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Używaj widoku zwartego otwierając okno rozmowy"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3877,19 +4001,23 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Zapytaj przed zamknięciem karty/okna rozmowy grupowej."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3897,24 +4025,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:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Czy pokazywać kartę gdy otwarta jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr ""
 "Czy pokazywać rozgraniczenie kart jeśli prowadzona jest tylko jedna rozmowa?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Czy pokazywać przycisk zamknięcia na karcie?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3922,7 +4050,7 @@ msgstr ""
 "Lista słów oddzielonych dwukropkami, które będą podświetlane w trakcie "
 "rozmowy w pokoju."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3931,13 +4059,13 @@ msgstr ""
 "Menadżera Okien. Ta opcja jest brana pod uwagę tylko gdy używana jest tacka "
 "systemowa."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3946,7 +4074,7 @@ msgstr ""
 "nieprzeczytaną wiadomość. Ikona ta może być animowana, w zależności od "
 "motywu."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3954,7 +4082,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:168
+#: ../src/common/config.py:179
 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."
@@ -3962,8 +4090,8 @@ msgstr ""
 "Jeśli ma wartość True, Gajim wyśle zapytanie o awatar każdego kontaktu, "
 "który ostatnio nie miał awatara lub ma zapisany jedynie stary."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3971,72 +4099,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "ÅšpiÄ™"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "OglÄ…dam film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "PracujÄ™."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4045,7 +4188,7 @@ msgstr ""
 "wyrazów ze zmiennej muc_highlight_words lub gdy wiadomość MUC zawierać "
 "będzie twój pseudonim."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4055,61 +4198,66 @@ msgstr ""
 "wartość True)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "zielony"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "morski"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "czysty"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Nie można dołączyć do pokoju"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Aby dołączyć do tego pokoju, wymagane jest hasło."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Zostałeś zabanowany w tym pokoju."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Taki pokój nie istnieje."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Tworzenie pokoi jest ograniczone."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Twój zarejestrowany pseudonim musi być w użyciu."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Nie jesteś na liście członków."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4118,38 +4266,38 @@ msgstr ""
 "innego.\n"
 "Podaj inny pseudonim:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "Zapisaliśmy się do %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Prośba o cofnięcie autoryzacji od %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "Wypisaliśmy się z %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4159,61 +4307,61 @@ msgstr ""
 "Skorzystaj z narzędzi do zarządzania listą kontaktów, takich jak http://jru."
 "jabberstudio.org/ aby go usunąć."
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Połączony z serwerem %s: %s z %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "Rozłączony"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Jestem %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4222,16 +4370,16 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Limit czasu"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Wystąpił błąd protokołu:"
 
@@ -4353,10 +4501,6 @@ msgstr "N_iewidoczny"
 msgid "Invisible"
 msgstr "Niewidoczny"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Spoza listy kontaktów"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact ma status: Nieznany"
@@ -4444,10 +4588,39 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "cyjan"
 
+#~ msgid "account: "
+#~ msgstr "konto: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Czy jesteś pewien, że chcesz opuścić pokoje \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Jeśli zamkniesz to okno, to połączenie z tymi pokojami zostanie zerwane."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Włącz/Wyłącz powiadomienie o zakończeniu przesyłania pliku."
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Usuwanie wybranego transferu pliku"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Zatrzymanie wybranego transferu pliku"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Używaj jednego okna rozmowy z kar_tami"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Jeśłi zamkniesz tę kartę, a nie masz auktywnionej opcji historii, to "
+#~ "utracisz tę wiadomość."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Nie można usunąć ostatniej grupy"
 
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index 00ca469528f4191b6ffae535a516ca7ee1bd0f72..378cc35729702a2fa82b383dbd926f5510c77247 100644
--- a/po/pt/LC_MESSAGES/gajim.po
+++ b/po/pt/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -20,9 +20,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Cliente Jabber GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -52,39 +51,8 @@ msgstr "(Nenhum)"
 msgid "Hidden"
 msgstr "Escondida"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Conversa"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Chat"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "conta: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "Fora da lista"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Mudar para %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -100,220 +68,374 @@ msgstr ""
 "\n"
 "A função de destaque de palavras mal soletradas não será usada"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Uma ligação não está disponível"
+
+#: ../src/chat_control.py:302
+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."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "Fora da lista"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Conversa"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Encriptação OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Encriptação activada"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Encriptação desactivada"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Recebeu uma nova mensagem de \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
+"perdida."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Todos os %s _minutos"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Activo"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "título da mensagem de estado"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "texto da mensagem de estado"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "Não é possível usar OpenPGP neste computador"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Está neste momento ligado ao servidor"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, deve estar disconectado."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio"
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços"
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Um Jabber ID deve estar no formato \"utilizador@nomedoservidor\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Tal conta não está disponível"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Erro ao receber as chaves secretas"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema ao receber as suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Nenhuma chave seleccionada"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registar para %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Membro"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Dono"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrador"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Expulsar"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Função:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Banindo %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrador"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está ligada ao servidor"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Se remover isto, a ligação será perdida."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Guardar senha"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Este bookmark tem dados inválidos"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Nome de utilizador inválido"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Deve introduzir um nome de utilizador para configurar esta conta."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 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:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "A conta foi adicionada com sucesso"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -322,23 +444,23 @@ msgstr ""
 "tarde clicando no item de menu Contas dentro do menu Editar a partir da "
 "janela principal."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "A sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Ocorreu um erro ao criar a conta"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -346,48 +468,48 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde que prestou atenção a este "
 "chat pela última vez."
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Acções para \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Falta um \"%s\" no URL do Dicionário e como tal não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Pesquisar na Web sobre o assunto"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "Há %i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -413,12 +535,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transportes"
 
@@ -473,44 +595,67 @@ msgstr "Este contacto já se encontra na sua lista de contactos."
 msgid "A GTK+ jabber client"
 msgstr "Um cliente Jabber GTK+"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Miguel Fonseca <miguelcsf@gmail.com>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, 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:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Pedido de subscrição de %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Entrar num Chat com a conta %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Entrar num Chat"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Nome de utilizador inválido"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar conversa com a conta %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Iniciar Conversa"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -519,137 +664,155 @@ msgstr ""
 "de enviar uma mensagem instantânea:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Ligação indisponível"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, verifique se está ligado com \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Tem de estar ligado para poder mudar a sua senha."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Deve introduzir uma senha."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "As senhas não conferem"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas introduzidas em ambos os campos devem ser idênticas."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Contacto Entrou"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Contacto Saiu"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nova Mensagem Instantânea"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nova Mensagem Privada"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "De %s na sala %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Pedido de Transferência de Ficheiro"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Ficheiro"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Transferência de Ficheiro Completa"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Transferência de Ficheiro Parada"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Para %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Mensagem Simples com a conta %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Mensagem Simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Foi convidado para a sala %(room_jid)s por %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -696,11 +859,6 @@ msgstr "Este tipo de serviço/recurso não contém itens para explorar."
 msgid "Browsing %s"
 msgstr "Versão %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Explorar"
@@ -709,30 +867,30 @@ msgstr "_Explorar"
 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:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Utilizadores"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Descrição"
 
@@ -753,7 +911,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome do ficheiro: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
@@ -769,8 +927,8 @@ msgstr "Você"
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -783,7 +941,7 @@ msgstr "Guardado em: %s"
 msgid "File transfer completed"
 msgstr "Transferência de ficheiro completa"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Abrir Pasta"
 
@@ -807,50 +965,55 @@ msgstr "Escolher Ficheiro para Enviar"
 msgid "Send"
 msgstr "Enviar"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim não consegue aceder a este ficheiro"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Este ficheiro está a ser usado por outro processo."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Este ficheiro já existe"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>O que pretende fazer?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Ficheiro: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer enviar-lhe um ficheiro:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Guardar Ficheiro como..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Este ficheiro já existe"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -858,37 +1021,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Ficheiro Inválido"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Ficheiro: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Não é possível enviar ficheiros vazios"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1156,33 +1319,33 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Escreva \"%s help %s\" para mais informações"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necesita do Xserver para ser executado. Saindo..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necessita do PyGTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necessita do GTK versão 2.6 ou acima"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Falta suporte libglade para o runtime GTK+"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1191,7 +1354,7 @@ msgstr ""
 "Por favor remova o seu runtime GTK+ actual e instale a última versão estável "
 "de %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1199,77 +1362,77 @@ msgstr ""
 "Por favor, certifique-se de que o GTK e o PyGTK têm suporte libglade no seu "
 "sistema."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorização para %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Aceita este pedido?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "erro ao enviar"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorização aceite"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contacto \"%s\" removeu a sua subscrição para si"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Vê-lo-á sempre como estando offline."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contacto com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Verifique a sua ligação ou tente novamente mais tarde."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está agora  %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "A sua chave de acesso está incorrecta"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Está neste momento ligado sem a sua chave OpenPGP."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "Publicação vCard deu-se com sucesso"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "As suas informações pessoais foram publicadas com sucesso."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1279,35 +1442,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 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:1459
+#: ../src/gajim.py:1532
 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:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
@@ -1330,147 +1493,99 @@ msgstr "Não pode apagar o seu tema actual"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor, escolha primeiro outro para o seu tema actual."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Se fechar esta janela, perder-se-á a ligação a estas salas."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Falha ao enviar uma mensagem privada"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, 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_window.py:156
-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."
+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_window.py:160
-msgid "Do _not ask me again"
-msgstr "_Não voltar a perguntar"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Chat"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Esta sala não tem assunto"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi expulso: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s foi banido: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "É agora conhecido como %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s está agora %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Mudar Assunto"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Por favor, especifique o novo assunto:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Mudar Alcunha"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Por favor, especifique a nova alcunha a usar:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bookmark já está configurado"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Sala \"%s\" já existe nos seus bookmarks."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark foi adicionado com sucesso"
-
-#: ../src/groupchat_window.py:601
-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."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Uma ligação não está disponível"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-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/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Alcunha não encontrada: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1482,7 +1597,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1490,12 +1605,12 @@ msgstr ""
 "Uso: /%s <alcunha>, abre uma janela de conversa privada com o ocupante "
 "especificado."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, limpa a janela de texto."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1504,12 +1619,12 @@ msgstr ""
 "Uso: /%s [razão], fecha a janela ou aba actual, exibindo a razão se "
 "especificada."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1518,7 +1633,7 @@ msgstr ""
 "Uso: /%s <JID> [razão], convida o JID para a sala actual, fornecendo "
 "opcionalmente uma razão."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1527,7 +1642,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/alcunha], convida a juntar-se a sala@servidor, "
 "usando opcionalmente uma alcunha especificada."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1537,7 +1652,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_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1546,7 +1661,7 @@ msgstr ""
 "Uso: /%s <acção>, envia uma acção para a sala actual. Utilize a terceira "
 "pessoa. (Por exemplo, /%s explode.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1555,40 +1670,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_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Não há informações de ajuda para /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "_Não voltar a perguntar"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Mudar Assunto"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Por favor, especifique o novo assunto:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Mudar Alcunha"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Por favor, especifique a nova alcunha a usar:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Bookmark já está configurado"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Sala \"%s\" já existe nos seus bookmarks."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark foi adicionado com sucesso"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Pode especificar uma razão em baixo:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -1747,44 +1909,38 @@ msgid "Accounts"
 msgstr "Contas"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr ""
-"Activar/Desactivar notificação para quando uma transferência de ficheiro "
-"estiver completa"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Acções A_vançadas"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contacto"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Adicionar _Contacto"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Editor de Configuração Avançada"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Depois da alcunha:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Depois da hora:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1794,63 +1950,63 @@ msgstr ""
 "Apenas compondo uma mensagem\n"
 "Desactivado"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Permitir que ele/ela veja o meu estado"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Conhecido também como estilo iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Pedir a mensagem de estado quando eu me: "
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Pedir para ver o estado dele/dela"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Perguntar:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Marcar automaticamente como _ausente depois de:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Marcar automaticamente como _indisponível depois de:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Entrar automaticamente"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1862,73 +2018,73 @@ msgstr ""
 "Usar sempre aplicações KDE padrão\n"
 "Personalizar"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Autorizar automaticamente contacto"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Religar automaticamente em caso de perda de ligação."
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Antes da alcunha:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Antes da hora:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Aniversário"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Build custom query"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Ligar ao arranque"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de ficheiro"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Cancela a transferência de ficheiro seleccionada"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Cancela a transferência de ficheiro seleccionada e remove o ficheiro "
 "incompleto"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Mu_dar Senha"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Muda Alcu_nha"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Muda A_ssunto"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficação do estado da conversa:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1938,7 +2094,7 @@ msgstr ""
 "spammar/incomodar. Use com precaução, pois isto bloqueia todas as mensagens "
 "de qualquer contacto que não estiver na sua lista."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1950,214 +2106,215 @@ msgstr ""
 "Gajim usa encriptação TLS por defeito se emitida pelo servidor, e que com "
 "esta opção marcada o TLS será desactivado."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "_Escolha chave..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Limpar"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Clique para ver os serviços (tais como transportes MSN e ICQ) dos servidores "
 "jabber"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Clique para ver conversas anteriores nesta sala"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Clique para ver conversas anteriores com este contacto"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Empresa:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Configurar _Sala"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Ligar quando eu premir Concluir"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Ligação"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Informações do Contacto"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Infos do Contacto"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Histórico das Conversas"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "País:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Iconset de _estados padrão:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Apagar MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Apagar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Apaga a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Negar"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Exibir imagens pessoais (avatars) dos contactos na lista"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Exibir mensagens de estado dos contactos na lista"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Editar Detalhes Pessoais..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Gerir Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Activar"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Introduza novamente para confirmação"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Introduza a nova senha:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Família:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transferências de Ficheiros"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Transferências de Ficheiros"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Estilo da letra:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Letra:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Proibí-lo /-la de ver o meu estado"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: AAAA-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Questões Perguntadas Frequentemente (FAQ) (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Ir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Personalização de Temas do Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2165,7 +2322,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:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2173,7 +2330,7 @@ msgstr ""
 "Gajim exibirá automaticamente a nova mensagem recebida numa nova janela de "
 "conversa ou numa aba numa janela existente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2181,7 +2338,7 @@ msgstr ""
 "Gajim o notificará a cada nova mensagem através de um popup no canto "
 "inferior direito do ecrã"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2189,7 +2346,7 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se ligarem"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2197,71 +2354,71 @@ msgstr ""
 "Gajim o notificará através de um popup no canto inferior direito do ecrã "
 "sobre os contactos que se desligarem"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim mudará apenas o ícone do contacto que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Criação Passo-a-passo de uma Conta"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Geral"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nome Dado:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Ligação HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Esconde a janela"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Página pessoal:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Nome do Host:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Já tenho uma conta e quero usá-la"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Quero _registar uma nova conta"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Gostaria de o adicionar à minha lista de contactos."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se marcado, o Gajim terá também um ícone na área de notificação"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Se marcado, Gajim exibirá imagens pessoais (avatars) dos seus contactos na "
 "lista"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2269,15 +2426,15 @@ msgstr ""
 "Se marcado, Gajim exibirá as mensagens de estado dos contactos debaixo dos "
 "nomes de cada um na janela principal"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Se marcado, o Gajim juntar-se-á a este chat no arranque"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrar-se-á da senha para esta conta"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2285,7 +2442,7 @@ msgstr ""
 "Se marcado, o Gajim lembrar-se-á da posição da janela principal na próxima "
 "vez que for executado"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2293,7 +2450,7 @@ msgstr ""
 "Se marcado, o Gajim trocará smilies ASCII tais como ':)' pelos emoticons "
 "gráficos equivalentes."
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2301,7 +2458,7 @@ msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive para evitar timeouts da "
 "ligação, os quais resultam na perda dessa ligação"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2309,7 +2466,7 @@ msgstr ""
 "Se marcado, o Gajim guardará a sua senha em ~/.gajim/config com permissão de "
 "'leitura' apenas para si"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2319,7 +2476,7 @@ msgstr ""
 "(Por exemplo, um contacto do MSN terá o ícone msn equivalente para o estado "
 "disponível, ausente, ocupado, etc...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2327,7 +2484,7 @@ msgstr ""
 "Se marcado, o Gajim, quando iniciado, ligar-se-á automaticamente ao jabber "
 "usando esta conta"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2336,7 +2493,7 @@ msgstr ""
 "Se marcado, qualquer mudança feita ao estado global (gerido pelo combobox no "
 "fundo da lista de contactos) alterará também o estado desta conta"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2344,167 +2501,180 @@ msgstr ""
 "Se tem duas ou mais contas e esta opção for marcada, o Gajim listará todos "
 "os contactos como se tivesse apenas uma conta"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Mensagem recebida:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre si, tal como estão gravadas no servidor"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "_Entrar num Chat"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Morada"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Gerir Contas"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Gerir Bookmarks"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Gerir Emoticons"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Gerir Perfis de Proxy"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Gerir..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Mais"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Alcunha:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Notificar-me sobre contactos que acabem de se: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Enviar mensagem e fechar a janela"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Encriptação OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Ou escolha uma mensagem pré-definida:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Mensagem a enviar:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Detalhes Pessoais..."
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefone:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Cargo:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefixo:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Mostrar hora:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2514,64 +2684,60 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Perfil, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Query Builder..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registar para"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _apenas do Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de ficheiro da lista."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Removendo transferência de ficheiro seleccionada"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Responder a esta mensagem"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Voltar às Cores Padrão"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Re_curso: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2585,219 +2751,215 @@ msgstr ""
 "recursos 'Casa' e 'Trabalho' ao mesmo tempo. O recurso com a maior "
 "prioridade receberá os eventos. (ver em baixo)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Função:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Guardar _frase de acesso (inseguro)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Guardar _históricos das conversas para todos os contactos"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Guardar _senha"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Pesquisar"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Enviar Ficheiro"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Enviar _Ficheiro"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Enviar _Nova Mensagem..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes keep-alive"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Definir MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Definir a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Definir _Avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Definir uma imagem pessoal (avatar) quando me ligo"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Define a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Mostrar Todos os _Eventos Pedentes"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contactos _Offline"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Mostrar _Lista de Contactos"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Mostrar Consola _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Mostrar apenas na _lista"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Ligar"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Desligar"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Ordenar contactos por estados"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Es_tado"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Iniciar _Conversa"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Estado"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Mensagem de estado:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Parando a transferência de ficheiro seleccionada"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Rua:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Pedido de Subscrição"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Subscrição:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Sufixo:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Sinc_ronizar estado da conta com estado global"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Letra do texto"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "A mensagem de estado auto-ausente"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "A mensagem de estado auto-indisponível"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2805,81 +2967,77 @@ msgstr ""
 "Esta acção remove uma única transferência de ficheiro da lista. Se a "
 "transferência estiver activa, será primeiro interrompida e depois removida."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Para:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Activar/Desactivar Encriptação Open_PGP"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Escreva a sua nova mensagem de estado:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Actualizar MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Actualizar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Actualiza a Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (específica)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Usar _emoticons"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Usar iconsets de _transportes"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Usar uma única janela de conversa com _abas"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Usar hostname/porta personalizados"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "ID do Utilizador:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2891,15 +3049,15 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Quando um novo evento é recebido"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2907,346 +3065,346 @@ msgstr ""
 "Necessita de uma conta para se poder ligar\n"
 "à rede Jabber."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "O seu JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Acções"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Adicionar Contacto"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Adicionar esta Sala aos _Bookmarks"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Navegador:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "Vista _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Conteúdo"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar JID/Endereço de Email"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Copiar Localização do Link"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Descobrir Recursos..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "C_hat"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ícone na bandeja (também conhecido por área de notificação)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 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:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Juntar-se a uma Nova Sala..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Expulsar"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Histórico das Conversas"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Arquivar mudanças de estado dos contactos"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "Cliente de e_mail:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Fundir contas"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Modificar Conta..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Notificar-me"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando uma transferência de ficheiro estiver completa"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "Acções de _Ocupantes"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "Utilizadores _Online"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Abrir Compositor de Email"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Abrir Link no Navegador"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Dono"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Mostrar a mensagem como pop-up"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Pesquisar"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "E_nviar"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "E_nviar & Fechar"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "E_nviar Mensagem Privada"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "E_nviar Mensagem de Servidor"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "E_nviar Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Definir Imagem"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Iniciar Conversa"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "E_stado"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Subscrever"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Subscrição"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "Nome de _utilizador"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Consola _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "lista de transferências de ficheiros"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutos"
 
@@ -3256,17 +3414,17 @@ msgstr "minutos"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Erro na leitura do ficheiro:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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"
@@ -3304,92 +3462,102 @@ msgstr "O estado é agora: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Estado é agora: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Mudar para %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s enviou-lhe uma nova mensagem."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer enviar-lhe um ficheiro."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Transferência de %(filename)s de %(name)s interrompida."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "Enviou com sucesso %(filename)s para %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Transferência de %(filename)s para %(name)s interrompida."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Contas fundidas"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Servidor"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Já está na sala %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Juntar-se a uma Nova Sala"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Gerir Bookmarks..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "usando a conta %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3397,67 +3565,67 @@ msgstr ""
 "Deixará de poder enviar e receber mensagens aos contactos desde este "
 "transport."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para aplicar ao contacto"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de o adicionar à minha lista"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Ligar"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Desligar"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3465,28 +3633,28 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Guardar frase de acesso"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3494,202 +3662,156 @@ 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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 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:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Estado..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "usando conta "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Esconder este menú"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s não emitiu uma chave OpenPGP nem você associou uma"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Recebeu uma nova mensagem de \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Se fechar esta aba e o histórico estiver desactivado, esta mensagem será "
-"perdida."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Se fechar esta aba e o histórico estiver desactivado, a mensagem será "
-"perdida."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Falha ao enviar uma mensagem privada"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Já não se encontra na sala \"%s\" ou \"%s\" saiu."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Encriptação activada"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Encriptação desactivada"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Função: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Subscrição:"
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Não iniciada"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Parada"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Completa"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pausada"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Interrompida"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "A transferir"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 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:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3703,24 +3825,24 @@ msgstr "_Escolher Avatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "O tamanho da imagem \"%s\" é muito grande"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "O tamanho do ficheiro não deve exceder os 32 kilobytes."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3728,7 +3850,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:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3736,36 +3858,36 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 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:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Detalhes Pessoais..."
@@ -3774,25 +3896,26 @@ msgstr "Detalhes Pessoais..."
 msgid "creating logs database"
 msgstr "a criar base de dados dos logs"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s é um ficheiro, mas deveria ser um directório"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim irá agora sair"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "a criar directório %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s é um directório, mas deveria ser um ficheiro"
@@ -3815,38 +3938,38 @@ msgstr "D-Bus não está presente nesta máquina, ou falta módulo python"
 msgid "Session bus is not available"
 msgstr "Sessão bus não está disponível"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Usar DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Ausente por estar inactivo"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Indisponível por estar inactivo"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no título da lista de contactos?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3854,12 +3977,12 @@ msgstr ""
 "Número de linhas, da conversa anterior, a lembrar para quando uma janela/aba "
 "de conversa seja reaberta."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3867,20 +3990,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Usar vista compacta quando uma janela de conversa é aberta"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3889,17 +4012,21 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Perguntar antes de fechar uma janela/aba de chat."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3907,23 +4034,23 @@ msgstr ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Mostrar borda da aba quando apenas numa conversa?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3931,7 +4058,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:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3939,11 +4066,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3951,7 +4078,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3959,7 +4086,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:168
+#: ../src/common/config.py:179
 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."
@@ -3967,8 +4094,8 @@ msgstr ""
 "Se Verdadeiro (True), Gajim perguntará por um avatar a cada contacto que não "
 "tinha um da última vez ou tenha um na memória cache há demasiado tempo."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3976,72 +4103,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "A dormir"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Volto daqui a alguns minutos"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "A comer"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Estou a comer, por isso deixe-me uma mensagem"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Estou a ver um filme."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "A trabalhar"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Estou a trabalhar"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Estou ao telefone."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Estou fora, fui apreciar a vida"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4049,7 +4191,7 @@ msgstr ""
 "Som a tocar quando uma mensagem de chat conter uma das palavras da lista "
 "muc_highlight_words, or quando uma mensagem conter a sua alcunha."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4058,61 +4200,66 @@ msgstr ""
 "notify_on_all_muc_messages estiver definido como Verdadeiro)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "simples"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Impossível entrar na sala"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "É necessária uma palavra-passe para esta sala."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Está banido/a desta sala."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Criação de salas encontra-se restrita."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "A sua alcunha registada tem de ser usada."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Não está na lista de membros."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4120,39 +4267,39 @@ 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:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "estamos agora subscritos a %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "pedido de remoção de subscrição por %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "já não estamos subscritos a %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Ligação com conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4162,61 +4309,61 @@ msgstr ""
 "ferramentas de gestão de lista (roster) tais como http://jru.jabberstudio."
 "org/ para o remover."
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível ligar a \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ligado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Verifique a sua ligação ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 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:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "Invisível"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Estou %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem é encriptada]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4225,16 +4372,16 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Ocorreu um erro de protocolo:"
 
@@ -4356,10 +4503,6 @@ msgstr "In_visível"
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Fora da lista"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Desconhecido"
@@ -4447,10 +4590,40 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "account: "
+#~ msgstr "conta: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Tem a certeza de que deseja sair das salas \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Se fechar esta janela, perder-se-á a ligação a estas salas."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr ""
+#~ "Activar/Desactivar notificação para quando uma transferência de ficheiro "
+#~ "estiver completa"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Removendo transferência de ficheiro seleccionada"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Parando a transferência de ficheiro seleccionada"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Usar uma única janela de conversa com _abas"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Se fechar esta aba e o histórico estiver desactivado, a mensagem será "
+#~ "perdida."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Não é possível remover o último grupo"
 
@@ -4511,9 +4684,6 @@ msgstr "cyan"
 #~ msgid "Chat with"
 #~ msgstr "Conversa com"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
 #, fuzzy
 #~ msgid "Send New Message"
 #~ msgstr "Nova Mensagem"
diff --git a/po/pt_BR/LC_MESSAGES/gajim.po b/po/pt_BR/LC_MESSAGES/gajim.po
index baaca4ef1e8b33d7d316465514595cc3eb36b2b4..46469a86aa7aee68c4f7186e596eba0aee96307e 100644
--- a/po/pt_BR/LC_MESSAGES/gajim.po
+++ b/po/pt_BR/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-11 14:06-0300\n"
 "Last-Translator: Alfredo Jr. (junix) <junix@targetlinux.org>\n"
 "Language-Team: none\n"
@@ -23,9 +23,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Um cliente jabber GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -55,39 +54,8 @@ msgstr "Nada"
 msgid "Hidden"
 msgstr "Escondido"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Conversa"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Conferência"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "conta: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "Fora da lista"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Alternar para %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 msgid ""
 "If that is not your language for which you want to highlight misspelled "
 "words, then please set your $LANG as appropriate. Eg. for French do export "
@@ -103,221 +71,375 @@ msgstr ""
 " globalmente em/etc/profile.\n"
 "Caracteristica de destacar palavras erradas não será usada"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Uma conexão não está disponível"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "Fora da lista"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Conversa"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Criptografia OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, 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:986
+msgid "Encryption enabled"
+msgstr "Criptografia habilitada"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Criptografia desabilitada"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, 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:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
+"será perdida."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Ativo"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Evento"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Som"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "título da mensagem de status"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "texto da mensagem de status"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP não disponível neste computador"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Você está atualmente conectado ao servidor"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Nome da conta não pode ser vazio."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Nome da conta não pode conter espaços."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Jabber ID Inválido:"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 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:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Entrada inválida"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "A porta do proxy deve ser um número de porta."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Conta não disponível"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 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:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Falha enquanto recebia as chaves secretas"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Nome"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Servidor"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "_Editar %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registro para %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Membro"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "D_ono"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrador"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Chutar"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Função:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Banindo %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>O que você quer fazer?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, 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:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, 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:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrador"
+
+#: ../src/config.py:1961
+#, 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:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Texto"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Nome de usuário inválido"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Você deve entrar com um nome para configurar esta conta."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 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:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Conta foi adicionada com sucesso"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -326,23 +448,23 @@ msgstr ""
 "Avançado, ou mais tarde clicando em Contas no item de menu da janela "
 "principal."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Sua nova conta foi criada com sucesso"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Um erro ocorreu durante a criação da conta"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Nome de conta em uso"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Você já tem uma conta usando este nome."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -350,48 +472,48 @@ msgstr ""
 "O texto abaixo desta linha é o que foi dito desde a última vez onde você "
 "prestou a atenção a conferência"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Ações para \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL do Dicionário não existe \"%s\" e isto não é WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Ontem"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i dias atrás"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
@@ -417,12 +539,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transportes"
 
@@ -477,46 +599,69 @@ msgstr "Este contato já encontra-se em sua lista."
 msgid "A GTK+ jabber client"
 msgstr "Um cliente jabber GTK+"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr ""
 "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Ingressar numa conferência com a conta %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Nome de usuário inválido"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Iniciar uma conferência com a conta %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -525,137 +670,155 @@ msgstr ""
 "enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, 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:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "As senhas digitadas em ambos os campos devem ser idênticas."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nova Mensagem"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Enviar Mensagem Privada"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "De %s na sala %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Para %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, 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/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Mensagem simples com conta %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Mensagem simples"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s escreveu:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Você foi convidado para a sala %(room_jid)s por %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -702,11 +865,6 @@ msgstr "Este tipo de serviço não contém nenhum item para navegar."
 msgid "Browsing %s"
 msgstr "Navegando %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Navegar"
@@ -715,30 +873,30 @@ msgstr "_Navegar"
 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:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Ingressar"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Buscando %d / %d"
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Usuários"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Descrição"
 
@@ -759,7 +917,7 @@ msgstr "Progresso"
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
@@ -775,8 +933,8 @@ msgstr "Você"
 msgid "Sender: %s"
 msgstr "Remetente: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Destinatário: "
 
@@ -789,7 +947,7 @@ msgstr "Salvo em: %s"
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
@@ -813,50 +971,55 @@ msgstr "Escolha o Arquivo para Enviar..."
 msgid "Send"
 msgstr "Enviar"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim não pode acessar este arquivo"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Este arquivo está sendo usado por outro processo."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Este arquivo já existe"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>O que você quer fazer?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Arquivo: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Descrição: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Salvar Arquivo como..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Este arquivo já existe"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -864,37 +1027,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Arquivo inválido"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Arquivo:"
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "não é possível enviar arquivos vazios"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -1155,31 +1318,31 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Tipo \"%s ajuda %s\" para maiores informações"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim necessita do Xserver para rodar. Encerrando..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim necessita PyGTK 2.6 ou acima"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim necessita GTK 2.6 ou acima"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "Não existe suporte para libglade no GTK+ runtime"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1188,7 +1351,7 @@ msgstr ""
 "Por favor remova seu GTK+ runtime atual e instale a última versão estável de "
 "%s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1196,77 +1359,77 @@ msgstr ""
 "Por favor certifique-se de que o gtk e o pygtk têm suporte ao libglade em "
 "seu sistema."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "Autorização HTTP (%s) para %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "erro no envio"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "Publicação do vCard bem sucedida"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Suas informações pessoais foram publicadas com sucesso."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1275,37 +1438,37 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Os logs foram migrados com sucesso à base de dados."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 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:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Migrando Logs..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
 
@@ -1326,148 +1489,99 @@ msgstr "Você não pode apagar o seu tema corrente"
 msgid "Please first choose another for your current theme."
 msgstr "Por favor escolha outro para seu tema corrente."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Você tem certeza que quer deixar estas salas \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Se você fechar esta janela, você será desconectado destas salas."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Falha ao Enviar uma mensagem privada"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Você tem certeza que quer deixar a sala \"%s\"?"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Se você fechar esta janela, você será desconectado desta sala."
+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_window.py:160
-msgid "Do _not ask me again"
-msgstr "Não _me pergunte novamente"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Conferência"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Esta sala não tem assunto"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s foi chutado: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s  foi banido: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Você agora é conhecido como %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s agora é conhecido como %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s saiu da sala"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s agora está %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Mudando Assunto"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Por favor, especifique o novo assunto:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Mudando Apelido"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Por favor, especifique o novo apelido que você quer usar:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bookmark já configurado"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Sala \"%s\" já existe nos bookmarks."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bookmark foi adicionado com sucesso"
-
-#: ../src/groupchat_window.py:601
-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."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Uma conexão não está disponível"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Apelido não encontrado: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s não parece ser um JID válido"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, 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_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Comandos: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1480,7 +1594,7 @@ msgstr ""
 "atualmente na sala, ele/ela será chutado também.  Não suporta espaços no "
 "apelido."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
@@ -1488,12 +1602,12 @@ msgstr ""
 "Uso: /%s <apelido>, abre uma janela de conferência privada para um ocupante "
 "específico."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Uso: /%s, apaga o texto da janela."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1502,12 +1616,12 @@ msgstr ""
 "Uso: /%s [rasão], fecha a janela corrente ou a aba, mostrando a razão se "
 "especificada."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1516,7 +1630,7 @@ msgstr ""
 "Uso: /%s <JID> [ razão ], convida JID à sala atual, fornecendo opcionalmente "
 "uma razão."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1525,7 +1639,7 @@ msgstr ""
 "Uso: /%s <sala>@<servidor>[/apelido], oferece para entrar na sala@servidor "
 "opcionalmente usando um apelido específico."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1535,7 +1649,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_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1544,7 +1658,7 @@ msgstr ""
 "Uso: /%s <ação>, emite a ação à sala atual. Use a terceira pessoa (por "
 "exemplo: /%s explodes.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1553,40 +1667,88 @@ msgstr ""
 "Uso: /%s <apelido> [ mensagem ], abre uma janela de mensagem privada e envia "
 "uma mensagem ao ocupante especificado pelo apelido."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Uso: /%s <apelido>, muda seu apelido na sala corrente."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Sem ajuda para /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Não _me pergunte novamente"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Mudando Assunto"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Por favor, especifique o novo assunto:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Mudando Apelido"
+
+#: ../src/groupchat_control.py:1071
+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:1089
+msgid "Bookmark already set"
+msgstr "Bookmark já configurado"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Sala \"%s\" já existe nos bookmarks."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bookmark foi adicionado com sucesso"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
@@ -1743,44 +1905,38 @@ msgid "Accounts"
 msgstr "Contas"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr ""
-"Ativar/Desativar notificação quando um transferência de arquivo estiver "
-"completa"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "_Ações Avançadas"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Adicionar Novo Contato"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Adicionar _Contato"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Endereço"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avançado"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Editor de Configurações Avançadas"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Depois do apelido:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Depois da hora:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1790,62 +1946,62 @@ msgstr ""
 "Escrevendo somente\n"
 "Desabilitado"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Permitir o envio de informações do _SO "
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Permita que ele/ela ver meu status"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Conhecido também como estilo iChat"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Solicite uma mensagem de status quanto eu:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Peça para ver o status dele/dela"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Perguntar:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Marcar como _afastado depois:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Ingresso automático"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1857,72 +2013,72 @@ msgstr ""
 "Sempre usar aplicações padrão KDE\n"
 "Customizar"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Autorizar automaticamente os contatos"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Reconectar automaticamente quando a conexão cair"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Antes do apelido:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Antes da hora:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Aniversário:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Negrito"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Gerar consulta customizada"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "C_onectar na inicialização do Gajim"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Cancelar transferência de arquivo"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Cancelar a transferência de arquivo selecionada"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr ""
 "Cancelar a transferência de arquivo selecionada e remove o arquivo incompleto"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Mudar Senha"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Mudar _Apelido"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Mudar _Assunto"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Noti_ficações do status da conversa:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1933,7 +2089,7 @@ msgstr ""
 "de qualquer contato que você não possuir na sua lista e queria lhe enviar "
 "uma mensagem"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1945,214 +2101,215 @@ msgstr ""
 "por padrão se disponibilizada pelo servidor e com esta opção habilitada o "
 "TLS será desabilitado"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "_Escolha a chave..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Cidade:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Limpar"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Clique para mudar a senha da conta"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Clique para inserir um emoticon (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Clique para ver os recursos do servidor jabber (como transportes MSN, ICQ, "
 "etc)"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Clique para ver o histórico de conversas nesta sala"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Clique para ver o histórico de conversas com este contato"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Cliente:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Empresa:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Configurar _Sala"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Conectar quando eu pressiono Fim"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Conexão"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Informações do Contato"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Informações de Contato"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Histórico de Conversação"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "País:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Conjunto de ícones de status padrão:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Deletar MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Deletar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Deletar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Negar"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Departamento:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Mostrar avatar dos contatos na lista"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Mostrar mensagem de status da lista de contato"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Editar Grupos"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Editar detalhes pessoais..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Editar _Grupos"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Gerenciar Emoticons"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Habilitar"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Entre novamente para confirmação:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Entre com a nova senha:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Eventos"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "De 5 em 5 _minutos"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Complemento:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Família:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Transferência de Arquivos"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Transferência de _Arquivos"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Gerenciamento de arquivos:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filtro:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Estilo da fonte:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Fonte:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Proibir ele/ela a ver meu status"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formato: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Perguntas freqüentes (online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Ir"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Customização de Temas do Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2160,7 +2317,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:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2168,7 +2325,7 @@ msgstr ""
 "Gajim automaticamente mostrará a nova mensagem recebida em uma nova janela "
 "de conversa ou aba em uma janela existente"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2176,7 +2333,7 @@ msgstr ""
 "Gajim notificará você de uma nova mensagem via uma alerta visual na lateral "
 "inferior direita da tela"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2184,7 +2341,7 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se conectaram"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2192,69 +2349,69 @@ msgstr ""
 "Gajim notificará você através de um alerta visual na parte inferior direita "
 "da tela sobre os contatos que se desconectaram"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim somente mudará o ícone do contato que enviou a nova mensagem"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Auxíliar de Configuração de Conta"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Geral"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Grupo:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "Conexão HTTP"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Ajuda online"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Esconder a janela"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Nome do Host:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Eu já tenho uma conta e quero usa-la"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Eu quero _registrar uma nova conta"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Por favor, eu gostaria de adiciona-lo à minha lista."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Se marcado, o Gajim também terá um ícone de bandeja"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr "Se checado, Gajim mostrará os avatares dos contatos na janela da lista"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2262,16 +2419,16 @@ msgstr ""
 "Se verificado, Gajim indicará mensagens de status dos contatos sob o nome do "
 "contato na janela da lista"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr ""
 "Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Se marcado, o Gajim lembrará a senha para esta conta"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2279,7 +2436,7 @@ msgstr ""
 "Se marcado, o Gajim lembrará a posição e tamanho da janela principal na "
 "próxima vez que você executa-lo"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2287,14 +2444,14 @@ msgstr ""
 "Se marcado, o Gajim trocará carinhas em ascii ':)' pelo emoticon gráfico "
 "equivalente"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
 msgstr ""
 "Se marcado, o Gajim enviará pacotes keep-alive que evitam queda de conexão"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2302,7 +2459,7 @@ msgstr ""
 "Se checado, o Gajim gravará sua senha em ~/.gajim/config com permissão de "
 "'leitura' somente para você"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2312,7 +2469,7 @@ msgstr ""
 "exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
 "conectado, ausente, ocupado, etc....)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2320,7 +2477,7 @@ msgstr ""
 "Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber "
 "usando esta conta"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2329,7 +2486,7 @@ msgstr ""
 "Se verificada, qualquer mudança ao status global (segurado pelo combobox no "
 "fundo da janela da lista) mudará o status deste cliente conformemente"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2337,167 +2494,180 @@ msgstr ""
 "Se você tem duas ou mais contas e isto é marcado, Gajim listará todos os "
 "contatos como se você tivesse somente uma conta"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Mensagem recebida:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Consulta"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informações sobre você são gravadas no servidor"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Convite Recebido"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Itálico"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "_Ingressar numa Conferência"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Endereço"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Gerenciar Contas"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Gerenciar Bookmarks"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Gerenciar Emoticons"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Gerenciar Perfis de Proxy"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Gerenciar..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Nome do meio:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derador"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Mais"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Apelido:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Nenhum"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Notifique-me sobre contatos ao: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "SO:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Em todas as _mensagens"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Enviar mensagem e fechar a janela"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Abrir..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Criptografia OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Ou escolha uma mensagem padrão:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Mensagem enviada:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Senha:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Informações Pessoais"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefone:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Tocar _Sons"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Porta:"
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Cargo:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Código Postal:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Preferências"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefixo:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Imprimir tempo:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "_Prioridade"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2507,65 +2677,61 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Perfil, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protocolo:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Gerador de consultas..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Recentemente:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrar para"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Remover conta _somente do Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Remover conta do Gajim e do _servidor"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Remover a transferência de arquivo da lista."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Removendo transferência de arquivo selecionada"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Resposta para esta mensagem"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Voltar para as Cores Padrões"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "_Recurso: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2579,217 +2745,213 @@ 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:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Recurso:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Função:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Configuração da Sala"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Sala:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Salvar _frase de acesso (inseguro)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Salvar histórico para todos os contatos desta conta"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Salvar senha"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Buscar"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "E_nviar"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Enviar _Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Enviar _Arquivo"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Enviar _nova Mensagem..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Enviar pacotes para manter a conexão (keep-alive)"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Enviar mensagem"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Enviar mensagem e fechar a janela"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Servidor:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Recursos dos Servidores"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Configurar MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Configurar _Avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Configura avatar quando eu conectar"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Configurar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Mostrar todos _Eventos Pendentes"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Mostrar Contatos desc_onectados"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Mostre _Lista"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Mostrar console _XML"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Mostre somente na _lista"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "_Conectar"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Desconectar"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Ordena contatos pelo status"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Sta_tus"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Iniciar conversa"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Estado:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Mensagem de status:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Parando a transferência de arquivo selecionada"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Rua:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Assunto:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Solicitação de Inscrição"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Inscrição:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Sobrenome:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "_Sincronizar status da conta com status global"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "_Cor do texto"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Fonte do texto"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "A mensagem de status para o ausente automático"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "A mensagem de status para o afastado automático"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2797,79 +2959,75 @@ msgstr ""
 "Esta ação remove uma única transferência de arquivo da lista. Se a "
 "transferência está ativa, isto vai pará-la e removê-la."
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Título:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Para:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Alternar criptografia Open_PGP"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Escreve sua nova mensagem de status:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Tipo:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Sublinhar"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Atualizar MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Atualiza Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Atualizar Mensagem do Dia"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Usar _SSL (obsoleto, apenas para servidores antigos)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Usar _emoticons"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Usar conjunto de ícones de _transportes"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "_Usar uma única janela de conversa com abas"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Usar autenticação"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Usa nomedohost/porta customizada"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "ID do Usuário:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2881,15 +3039,15 @@ 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:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Quando novo evento é recebido"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Trabalho"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2897,346 +3055,346 @@ msgstr ""
 "Você precisa ter uma conta para conectar na\n"
 "rede Jabber."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Seu JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Ações"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Adicionar Contato..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Adicionar à Lista"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Endereço:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Administração"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrador"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizar"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "Cor _de fundo"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Banir"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Adicionar esta Sala ao _Bookmark"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Navegar:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "Visão _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Índices"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Copiar Endereço de Email/JID"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Copia Localização do Link"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Negar"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Descubra Serviços"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Descubra Serviços..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Encerrar"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Conferência"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "Í_cone na bandeja (também conhecido por área de notificação)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 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:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Ingressar Nova Sala..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Chutar"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_Histórico de Conversação"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Log mudanças de status dos contatos"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Cliente de email:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Membro"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Juntar contato das contas"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Mensagem"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modificar"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Editar Conta..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Nome: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nunca"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Notifique-me sobre isto"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notificar-me quando a transmissão do arquivo terminar"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "Ações de _Ocupantes"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "Usuários C_onectados"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Abrir Cliente de E-mail"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Abrir link no Navegador"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "D_ono"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Senha:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Tocador de som:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Alerta visual"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Porta:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Preferências"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Presença"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publicar"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Sair"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Remover"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Responder"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Recuperar"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Buscar"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Enviar"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Enviar & Fechar"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Enviar Mensagem Privada"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Enviar Mensagem pelo Servidor"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Enviar uma Mensagem Simples"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Servidor:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Configurar Imagem"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Iniciar conversa"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Inscrever"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Inscrição"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Usar proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "Nome do _usuário"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Voz"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "Console _XML..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "lista de transferência de arquivos"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minutos"
 
@@ -3246,17 +3404,17 @@ msgstr "minutos"
 msgid "Error: cannot open %s for reading"
 msgstr "Erro: impossível abrir %s para leitura"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Erro lendo arquivo:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3295,159 +3453,169 @@ msgstr "Status agora é: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status agora é: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Alternar para %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s lhe enviou uma nova mensagem."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s quer te enviar um arquivo:"
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Você recebeu com sucesso %(filename)s de %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, 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/notify.py:191
+#: ../src/notify.py:190
 #, 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/notify.py:195
+#: ../src/notify.py:194
 #, 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/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Juntar contas"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Servidor"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Você já está na sala %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Ingressar na Nova Sala"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Gerenciar Bookmarks..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "usando conta %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 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:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Re_nomear"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Status"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3455,28 +3623,28 @@ 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Entre com a chave GPG para conta %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3484,20 +3652,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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3505,183 +3673,137 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Mudar Mensagem de Status..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "usando conta"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Esconder este menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s não tem uma chave OpenPGP distribuida e nem você atribuiu uma"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Você acabou de receber uma nova mensagem de \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Se você fechar esta aba e o histórico estiver desabilitado, esta mensagem "
-"será perdida."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Se você fechar esta aba e o histórico estiver desabilitado, a mensagem será "
-"perdida."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Falha ao Enviar uma mensagem privada"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Você não esta mais na sala \"%s\" ou \"%s\" saiu."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Criptografia habilitada"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Criptografia desabilitada"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, 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:279
+#: ../src/tooltips.py:278
 #, 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:285
+#: ../src/tooltips.py:284
 #, 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Regra: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Transferindo"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 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:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3695,24 +3817,24 @@ msgstr "_Escolha o Avatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "O arquivo de imagem \"%s\" é muito grande"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "O arquivo não deve ter mais do que 32 kilobytes."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3720,7 +3842,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:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3728,13 +3850,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:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3742,24 +3864,24 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Informações Pessoais"
@@ -3768,25 +3890,26 @@ msgstr "Informações Pessoais"
 msgid "creating logs database"
 msgstr "criando banco de dados de logs"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "criando diretório %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s é um diretório, mas deveria ser um arquivo"
@@ -3809,38 +3932,38 @@ msgstr "D-Bus não está presente nesta máquina o módulo python está faltando
 msgid "Session bus is not available"
 msgstr "Sessão bus não está disponível"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Use DBus e Notification-Daemon para mostrar notificações"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Afastado em conseqüência de estar inativo"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Não disponível em conseqüência de estar inativo"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Adicionar * e [n] no arquivo de lista?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3848,12 +3971,12 @@ msgstr ""
 "Quantas linhas para lembrar da conversação precedente quando uma aba/janela "
 "de bate-papo for reaberto."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3861,20 +3984,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3883,18 +4006,22 @@ 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:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 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:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3902,23 +4029,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:147
+#: ../src/common/config.py:156
 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:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Mostrar aba quando tiver apenas uma bate papo?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Mostrar borda da aba com apenas um bate papo?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Mostrar botão de fechar na aba?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3926,7 +4053,7 @@ msgstr ""
 "Uma lista semicolon-separada das palavras que serão destacadas no bate-papo "
 "multi-user."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3934,11 +4061,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3946,7 +4073,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3954,7 +4081,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:168
+#: ../src/common/config.py:179
 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."
@@ -3962,8 +4089,8 @@ msgstr ""
 "Se verdadeiro, Gajim pedirá por avatar cada contato que não teve um avatar "
 "ou tem um cache que é velho demais."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3971,72 +4098,87 @@ 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Estou fora curtindo a vida"
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4044,7 +4186,7 @@ msgstr ""
 "Som para tocar quando uma mensagem MUC conter uma das palavras no "
 "muc_hightlight_words, ou quando uma mensagem MUC conter seu apelido."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4053,61 +4195,66 @@ msgstr ""
 "exame no cliente somente se os notify_on_all_muc_messages for verdadeiro)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "verde"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "mantimento"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "humano"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "marinho"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "plano"
 
+#: ../src/common/connection.py:81
+#, 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:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Impossível ingressar na sala"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Uma senha é requerida para entrar nesta sala."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Você está banido desta sala."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Tal sala não existe."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "A criação de sala é restrita."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Seu nickname registado deve ser usado."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Você não está na lista de membros."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4115,39 +4262,39 @@ 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:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "nós estamos agora inscritos para %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "Remoção de Inscrição solicitada por %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "nós estamos agora sem inscrição para %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Conexão com a conta \"%s\" foi perdida"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4157,61 +4304,61 @@ msgstr ""
 "ferramentas de gerência da lista como http://jru.jabberstudio.org/ para "
 "removê-lo"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Conectado ao servidor %s:%s com %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 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:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "invisível"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Eu estou %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4220,16 +4367,16 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Tempo excedido"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Um erro de protocolo ocorreu:"
 
@@ -4351,10 +4498,6 @@ msgstr "_Invisível"
 msgid "Invisible"
 msgstr "Invisível"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Fora da lista"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contato tem status:Desconhecido"
@@ -4442,10 +4585,40 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "ciano"
 
+#~ msgid "account: "
+#~ msgstr "conta: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Você tem certeza que quer deixar estas salas \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Se você fechar esta janela, você será desconectado destas salas."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr ""
+#~ "Ativar/Desativar notificação quando um transferência de arquivo estiver "
+#~ "completa"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Removendo transferência de arquivo selecionada"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Parando a transferência de arquivo selecionada"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "_Usar uma única janela de conversa com abas"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Se você fechar esta aba e o histórico estiver desabilitado, a mensagem "
+#~ "será perdida."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Não é possível remover o último grupo"
 
@@ -4507,9 +4680,6 @@ msgstr "ciano"
 #~ msgid "Chat with"
 #~ msgstr "Conversa com"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
 #, fuzzy
 #~ msgid "Send New Message"
 #~ msgstr "Nova Mensagem"
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index a5d46501f6ddd88eac8b326f46797e3b23b803cb..7e5acda46e08a846e336b23ab8be40b1ee43c5e2 100644
--- a/po/ru/LC_MESSAGES/gajim.po
+++ b/po/ru/LC_MESSAGES/gajim.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\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"
@@ -29,9 +29,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "Jabber-клиент на GTK+"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -61,39 +60,8 @@ msgstr "(Нет)"
 msgid "Hidden"
 msgstr "Скрытый"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Чат"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Комната"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "учетная запись: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "не в ростере"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Переключиться на %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -110,223 +78,377 @@ msgstr ""
 "\n"
 "Выделение слов с опечатками выключено"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Подключение недоступно"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "не в ростере"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Чат"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "Шифрование OpenPGP"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "Ни %s не выдал OpenPGP ключ ни вы не присвоили ему такового"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "Шифрование включено"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Шифрование отключено"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Вы получили новое сообщение от \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+"сообщений, то это сообщение будет потеряно."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Каждые %s _минут"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Активен"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Событие"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Звук"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "заголовок сообщения сервера"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "текст сообщение сервера"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Выберите Звуковой Файл"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "В Формате Wav"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "Невозможно использовать OpenPGP"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Вы сейчас подсоединены к серверу"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Для смены имени учетной записи необходимо отключиться."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Неверное имя учетной записи"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Имя учетной записи не может быть пустым."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Имя учетной записи не может содержать пробелы."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Неверный Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Неверная запись"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "В качестве номера порта должно выступать число"
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Такая учетная запись недоступна"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Перед редактированием личных данных необходимо сначала создать учетную "
 "запись."
 
-#: ../src/config.py:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr ""
 "Чтобы отредактировать личную информацию нужно подсоединиться к серверу."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Не удалось получить секретный ключ"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Есть проблемы с получением вашего OpenPGP секретного ключа."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Парольная фраза"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Выберите свой OpenPGP ключ"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Имя"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Сервер"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Править %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Зарегистрировать %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Участник"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Владелец"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Администрирование"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Выгнать"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Обязанности:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Забанить %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Что вы хотите сделать?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Что вы хотите сделать?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Что вы хотите сделать?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Администрирование"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Что вы хотите сделать?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Текст"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Картинка"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Выбрать Картинку"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Учетная запись \"%s\" подключена к серверу"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Требуется Пароль"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Новая Комната"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь что заполнены поля с именем сервера и комнаты "
 "либо удалите эту закладку."
 
-#: ../src/config.py:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Неверное имя пользователя"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "Для настройки учетной записи необходимо ввести имя пользователя."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Необходимо ввести пароль для новой учетной записи."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Учентая запись успешно добавлена"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -335,23 +457,23 @@ msgstr ""
 "Вы можете настроить ее используя \n"
 "\"Настройка->Учентые записи\" из главного окна."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Ваша новая учетная запись успешно создана"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Произошла ошибка при создании учетной записи"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Такое имя учетной записи уже используется"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "У меня уже есть учетная запись, которую я хочу использовать."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -359,48 +481,48 @@ msgstr ""
 "Текст под этой линией был сказан после того, как вы последний раз "
 "заглядывали в эту комнату"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Действия для \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _Dictionary"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL словаря пропущен в \"%s\" и это не WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL Web-поиска отсутствует в \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Вчера"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i дней назад"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -426,12 +548,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Транспорты"
 
@@ -486,181 +608,222 @@ msgstr "Этот контакт уже содержится в вашем рос
 msgid "A GTK+ jabber client"
 msgstr "Jabber-клиент на GTK+"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "переводчики"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Запрос на подписку для учетной записи %s от %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Войти в Комнату с учетной записи %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Войти в Комнату"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Неверное имя пользователя"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Начать Беседу с учетной записью %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Начать Беседу"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 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:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь что вы подключены к \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Для изменения пароль необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля должны быть одинаковы."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Контакт В Сети"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Контакт Отключился"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Новое Сообшение"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Новое сообшение"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Новое Личное Сообщение"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "От %s в комнате %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Запрос Передачи"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Ошибка Передачи"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Передача Файла Завершена"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "К %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "У вас есть непрочитанные сообщения"
+msgstr[1] "У вас есть непрочитанные сообщения"
+msgstr[2] "У вас есть непрочитанные сообщения"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Новое Сообщение с учетной записи %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Сообщение"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s написал:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Консоль для %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML Консоль"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "%(contact_jid)s пригласил вас в комнату %(room_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -707,11 +870,6 @@ msgstr "Этот сервис не содержит ничего, что мож
 msgid "Browsing %s"
 msgstr "Просматриваю %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Браузер"
@@ -720,30 +878,30 @@ msgstr "_Браузер"
 msgid "This service does not contain any items to browse."
 msgstr "Этот сервис не содержит ничего, что можно было бы просмотреть."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Присоединиться"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Правка"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Сканирую %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Пользователи"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Описание"
 
@@ -764,7 +922,7 @@ msgstr "Прогресс"
 msgid "Filename: %s"
 msgstr "Имя файла: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Размер: %s"
@@ -780,8 +938,8 @@ msgstr "Ð’Ñ‹"
 msgid "Sender: %s"
 msgstr "Отправитель: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Получатель:"
 
@@ -794,7 +952,7 @@ msgstr "Сохранено в: %s"
 msgid "File transfer completed"
 msgstr "Передача завершена"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Открыть Папку с Принятым Файлом"
 
@@ -818,50 +976,55 @@ msgstr "Выбрать Файл для Отправки..."
 msgid "Send"
 msgstr "Отправить"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Нет доступа к файлу"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Файл занят другим процессом."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Файл уже существует"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Что вы хотите сделать?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Файл: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Описание: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s хочет отправит вам файл:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Сохнанить Файл как..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Файл уже существует"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -869,37 +1032,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Неверный файл"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Файл: "
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Нельзя отсылать пустые файлы"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Имя:  "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Пауза"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Продолжить"
 
@@ -1165,31 +1328,31 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "На берите \"%s\" help \"%s\" для справки"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim для запуска требуется X-сервер. Выхожу..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim требуется PyGTK 2.6 или выше"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется PyGTK 2.6 или выше. Выхожу..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim требуется GTK 2.6 или выше"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "Gajim для запуска требуется GTK 2.6 или выше. Выхожу..."
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "У GTK отсутствует поддержка libglade."
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1198,84 +1361,84 @@ msgstr ""
 "Пожалуйста, удалите вашу текущую версию GTK и установите последнюю "
 "стабильную версию с %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Пожалуйста, удостоверьтесь что GTK и PyGTK поддерживают libglade."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim для запуска требуется PySQLite2"
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Авторизация для %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "ошибка при отправке"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr ""
 "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его или её статус."
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" отозвал подписку с вами"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Вы всегда будете видеть его или её в оффлайне."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без OpenPGP ключа."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "vCard успешно опубликован"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Ваша информация о себе была успешно опубликована."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1284,36 +1447,36 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "Публикация vCard не удалась"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "История успешно перенесена в БД."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Отсутствует поддержка Управления Сессиями (отсутствует модуль gnome.ui)"
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Переношу Историю..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Пожалуйста, дождитесь окончания переноса истории..."
 
@@ -1334,148 +1497,100 @@ msgstr "Вы не можете удалить вашу текущую тему"
 msgid "Please first choose another for your current theme."
 msgstr "Пожалуйста, выберите сначала другую тему."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Вы точно хотите покинуть комнаты \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Если вы закроете это окно, то вы выйдете из этих комнат."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Не удалось отправить личное сообщение"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Вы точно хотите покинуть комнату \"%s\"?"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
+msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/groupchat_window.py:160
-msgid "Do _not ask me again"
-msgstr "Не _переспрашивать"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Комната"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "У комнаты нет темы"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s выгнали из комнаты: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s запретили заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(who)s запретил %(nick)s заходить в комнату: %(reason)s"
 
-#: ../src/groupchat_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Вы теперь известны как %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s теперь известен как %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s ушел"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Изменяет Тему"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Пожалуйста, введите новую тему:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Изменяет Ник"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Пожалуйста, введите новый ник который вы хотите использовать:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Закладка уже установлена"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Комната \"%s\" уже есть в ваших закладках."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Закладка успешно добавлена"
-
-#: ../src/groupchat_window.py:601
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Подключение недоступно"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Ник не обнаружен: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s не является нормальным JID"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 "Команды /%s не существует (если вы хотите её просто передать, то добавьте "
 "это с префикс /say)"
 
-#: ../src/groupchat_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Команды: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1488,19 +1603,19 @@ msgstr ""
 "данный момент находится в комнате, то он/она/оно так же будет выгнан. НЕ "
 "поддерживает пробелы в никах."
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 "Использование: /%s <ник>, открывает окно привата с указанным посетителем."
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Использование: /%s, очищает текстовое окно."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1509,12 +1624,12 @@ msgstr ""
 "Использование: /%s [причина], закрывает текущее окно или вкладку, с приводя "
 "причину, если она указана."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "Использование: /%s, переводит окно комнаты в компактный режим."
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1523,7 +1638,7 @@ msgstr ""
 "Использование: /%s <JID> [причина], приглашает JID в текущую комнату, с "
 "возможным указанием причины."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1532,7 +1647,7 @@ msgstr ""
 "Использование: /%s <комната>@<сервер>[/ник], предлагает присоединиться к "
 "комната@сервер, с возможным указанием ника."
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1542,7 +1657,7 @@ msgstr ""
 "Использование: /%s <ник> [причина], удаляет посетителя с указанным ником из "
 "комнаты с возможным указанием причины. НЕ поддерживает пробелы в нике."
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1551,7 +1666,7 @@ msgstr ""
 "Использование: /%s <действие>, совершает действие в текущей комнате. "
 "Используйте третье лицо (напр. /%s взрывается.)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1560,18 +1675,18 @@ msgstr ""
 "Использование: /%s <ник> [сообщение], открывает окно привата и отсылает "
 "сообщение посетителю с указанным ником."
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "Использование: /%s <ник>, меняет ваш ник в текущей комнате."
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 "Использование: /%s [тема], показывает или изменяет текущую тему комнаты."
 
-#: ../src/groupchat_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -1579,23 +1694,70 @@ msgstr ""
 "Использование: /%s <сообщение>, отсылает сообщение без поиска других команд "
 "в нем."
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Нет подсказки для /%s"
 
+#: ../src/groupchat_control.py:1022
+#, python-format
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr "Вы точно хотите покинуть комнату \"%s\"?"
+
+#: ../src/groupchat_control.py:1023
+msgid "If you close this window, you will be disconnected from this room."
+msgstr "Если вы закроете это окно, то вы выйдете из этой комнаты."
+
+#: ../src/groupchat_control.py:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Не _переспрашивать"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Изменяет Тему"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Пожалуйста, введите новую тему:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Изменяет Ник"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Пожалуйста, введите новый ник который вы хотите использовать:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Закладка уже установлена"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Комната \"%s\" уже есть в ваших закладках."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Закладка успешно добавлена"
+
+#: ../src/groupchat_control.py:1101
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
+
 #. ask for reason
-#: ../src/groupchat_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Кикнуть %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
@@ -1754,42 +1916,38 @@ msgid "Accounts"
 msgstr "Учетные записи"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Включить/Выключить уведомления о завершении передачи файла"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "Расширенный _Действия"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Добавить Новый Контакт"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Добавить _Контакт"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Адрес"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Расширенный"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Расширенный Редактор Настроек"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "После ника:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "После времени:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1799,61 +1957,61 @@ msgstr ""
 "Только печать\n"
 "Отключено "
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Отсылать информацию об _ОС"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Позволить ему или ей видеть мой статус"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "Позволять уведомления в режиме _ушел/недоступен/занят/невидимка"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "как iChat стиль"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Запрашивать сообщение о статусе в момент: "
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Попросить возможность видеть его или её статус"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Спрашивать:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Назначить OpenPGP ключ"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr "Авторизовать контакт (Он будет видеть ваш статус)"
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Авто-_отошел после:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Авто-_недоступен после:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Автоматическое присоединение"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1865,71 +2023,71 @@ msgstr ""
 "Всегда использовать приложения KDE по умолчанию\n"
 "Другое"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Автоматически авторизовать контакт"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Автоподключение при разрыве связи"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "До ника:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "До времени:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "День рождения:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Жирный"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Составить свой запрос"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Соединяться при запуске Gajim"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Отменить передачу"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Отменяет выбранную передачу"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Отменяет выбранную передачу и удаляет неполные файлы"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "И_зменить Пароль"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Изменить Пароль"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Изменить _Ник"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Изменить _Тему"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "_Уведомление об изменении состояния:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1939,7 +2097,7 @@ msgstr ""
 "вас. Используйте с осторожностью, потому что это заблокирует все сообщения "
 "от контактов не из вашего ротера."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1951,219 +2109,220 @@ msgstr ""
 "использует TLS шифрование по умолчанию если сервер предоставляет такую "
 "возможность, с этой же опцией TLS отключется"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Использовать _Ключ..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Город:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Очистить"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Щелкните для изменения пароль"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Щелкните, чтобы вставить смайлик (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Щелкните чтобы просмотреть сервисы предоставляемые jabber сервером (например "
 "MSN, ICQ транспорты)"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Щелкните для просмотра бесед с этим человеком"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Щелкните для просмотра бесед с этим человеком"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Клиент:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Компания:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Настроить _Комнату"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Подключиться когда я нажму Конец"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Соединение"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Информация о контакте"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "_Информация о Контакте"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "История"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Страна:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Иконки по _умолчанию для статуса"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Удалить MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Удалить фортунку"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Удаляет фортунку"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Отклонить"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "Отклонить авторизацию от контакта (Он не сможет видеть ваш статус)"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Отделение:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Показавать аватары для контактов в ростере"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Показать сообщения о статусе контакта в ростере"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "Почта:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Редактировать Группы"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Редактировать Личную Информацию..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Редактировать Группы"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Управление Смайликами"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Включить"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Введите опять для подтверждения:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Введите новый пароль"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "События"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Каждые 5 _минут"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Дополнительный Адрес:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Фамилия:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Передачи"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "_Передачи"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Менеджер файлов:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Фильтр:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Запретить ему или ей видеть мой статус"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Формат: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Частозадаваемые Вопросы (в сети)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "_Вперед"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Настройка Тем для Gajim"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
 msgstr ""
 "Gajim может отсылать и получать метаданные относящиеся к беседе с контактом."
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2171,7 +2330,7 @@ msgstr ""
 "Gajim будет автоматически показывать новое полученное соощение в новом окне "
 "чата или табе в существующем окне чата"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2179,7 +2338,7 @@ msgstr ""
 "Gajim будет уведомлять вас о новом сообщении с помощью сообщения в правом "
 "нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2187,7 +2346,7 @@ msgstr ""
 "Gajim будет уведомлять вас о присоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2195,71 +2354,71 @@ msgstr ""
 "Gajim будет уведомлять вас о отсоединившемся контакте с помощью сообщения в "
 "правом нижнем углу экрана"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Мастер Создания Учетной Записи"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Общие"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Имя:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Группа:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP Соединение"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Помощь онлайн"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Скрывает окно"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Веб-страница:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Хост: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "У меня уже есть учетная запись, которую я хочу использовать"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Я хочу _зарегистрировать новую учетную запись"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Вы не возражаете, если я добавлю Вас в контакт лист?"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Если отмечено, то Gajim будет помещать иконку в трей"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr ""
 "Если отмечено, то Gajim будет показывать аватары контактов в окне ростера"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2267,21 +2426,21 @@ msgstr ""
 "Если отмечено, то Gajim будет отображать сообщение о статусе контакта под "
 "его именем в окне ростера"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Если отмечено, то Gajim будет входить в комнату при запуске"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Если отмечено, то Gajim запомнит пароль учетной записи"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
 msgstr "Если отмечено, то Gajim запомнит позицию и размер окна ростера"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2289,7 +2448,7 @@ msgstr ""
 "Если отмечено, то Gajim будет заменять текстовые смайлики, например ':)' их "
 "графическим эквивалентом"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2297,7 +2456,7 @@ msgstr ""
 "Если отмечено, то Gajim будет пинговать сервер чтобы избежать разрыва "
 "соединения по таймауту"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2305,7 +2464,7 @@ msgstr ""
 "Если отмечено, то Gajim сохранит пароль в ~/.gajim/config с доступом на "
 "чтение только для вас"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2315,7 +2474,7 @@ msgstr ""
 "(например: Контакты с MSN будут иметь соответствующие иконки msn для "
 "статусов в сети, ушел, занят и т.д....)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2323,7 +2482,7 @@ msgstr ""
 "Если отмечено, Gajim, после запуска, будет автоматически подсоединяться к "
 "jabber серверу с использованием этой учетной записи"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2333,7 +2492,7 @@ msgstr ""
 "выпадающего списка внизу окна ростера) повлекут за собой изменение статуса "
 "этой учетной записи"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2341,167 +2500,180 @@ msgstr ""
 "Если у вас 2 и более учетных записей, то отметив здесь, вы заставите Gajim "
 "выводить вместе контакты из всех учетных записей"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Входящее сообщение:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Информация/Запрос"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Информация о вас, как она хранится на сервере"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Получено Приглашение"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Курсив"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Войти в _Комнату"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Расположение"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Управление Учетными записями"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Управление Закладками"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Управление Смайликами"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Управление Профилями Прокси"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Управление..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Отчество:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "_Модератор"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Еще"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Ник:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Нет"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Уведомлять о контактах которые: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "ОС:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "В _каждой строке"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Отправить сообщение и закрыть окно"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Открыть..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "Шифрование OpenPGP"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Или выберите предустановленное сообщение:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Исходящее сообщение:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "П_ароль"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Пароль:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Редактировать Личную Информацию"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Телефон:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Проигрывать _звук"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Порт: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Должность:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Индекс:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Настройки"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Префикс:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Выводить время:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Приори_тет:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2512,63 +2684,59 @@ msgstr ""
 "той же учетной записью. Клиент с наибольшим приоритетом будет получать "
 "события"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Профиль, Аватара"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Протокол:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Прокси:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Редактор Запросов..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Недавно:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Зарегистрировать в"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "Удалит учетную запись _только из Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Удалить учетную запись из Gajim и с _сервера"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Удалить передачу из списка."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "Удаляет завершеные, отмененные и неудачные передачи из списка"
 
-#: ../src/gtkgui.glade.h:229
-msgid "Removing selected file transfer"
-msgstr "Удаляет выделенную передачу"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Ответить на это сообщение"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Вернуться к Цветам по Умолчанию"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Ресу_рс: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2583,218 +2751,214 @@ msgstr ""
 "одновременно. Ресурс, который имеет больший приоритет будет получать все "
 "события. (См. ниже)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Ресурс:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Обязанности:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Настройки Комнаты"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Комната:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Сохранить _парольную фразу (небезопасно)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "Сохранить _положение и размер ростера и окон бесед"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "_История всех контактов для этой учетной записи"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Сохранить _пароль"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Поиск"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "_Отправить"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "_Отправить Файл"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Отправить _Сообщение"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Отправить _Файл"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Отправить _Новое Сообщение..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Отправить пинг"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Отправить сообщение"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Отправить сообщение и закрыть окно"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 msgid "Sends a message to currently connected users to this server"
 msgstr ""
 "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Параметры Сервера"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Установить MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Установить фортунку"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Установить _Аватару"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Установить аватару при подсоединении"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Устанавливает фортунку"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Показать Непросмотренные _События"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Показать _Отключенных"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Показать _Ростер"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Показать _XML Консоль"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Показывать только в _ростере"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr "Показывает список передач между вами и остальными"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "В_ошли"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "В_ышли"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Сортировать контакты по статусу"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "Ста_тус"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Начать _Чат"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Штат:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Статус"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Сообщение сервера:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Статус:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Останавливает выбранную передачу"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Улица:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Тема:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Запрос Подписки"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Подписка:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Суффикс:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Син_хронизировать статус учетной записи с глобальным статусом"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Цвет _текста:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "Цвет _шрифта:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Сообщение о статусе для авто-отошел"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Сообщение о статусе для авто-недоступен"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Тема:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2802,79 +2966,75 @@ msgstr ""
 "Это действие удаляет единичную передачу из списка. Если передача еще "
 "активна, она сначала останавливается и после удаляется"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Заголовок:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "К:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Включить Open_PGP Шифрование"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Введите ваше новое сообщение о статусе"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Тип:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Подчеркивание"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Обновить MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Обновить фортунку"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Обновляет фортунку"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Использовать _SSL (legacy)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Использовать _смайлики"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Использовать иконки для _транспортов"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Использовать единое окно чата с _табами"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Использовать аутентификацию"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Использовать пользовательские хост/порт"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "ID пользователя:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 msgid "When a file transfer is complete show a popup notification"
 msgstr "Показать уведомление по окончании загрузки"
 
-#: ../src/gtkgui.glade.h:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2886,15 +3046,15 @@ msgstr ""
 "Событие соответствующее новому сообщению, не происходит если вы уже "
 "беседуете с контактом"
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Когда получено новое сообытие"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Работа"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2902,346 +3062,346 @@ msgstr ""
 "Необходимо создать учетную запись для присоединения \n"
 "к Jabber сети."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Ваш JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Действия"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Добавить Контакт..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "Добавить в Ростер"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Адрес:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Админ"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Администрирование"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Дополнительные действия"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Авторизовать"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "Цвет _фона"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Забанить"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "Добавить Эту Комнату в _Закладки"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Браузер:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "О_тменить"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Компактный Вид    Alt-C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Содержание"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Скопировать JID/Почтовый Адрес"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Копировать адрес ссылки"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Отклонить"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Просмотреть Сервисы"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Просмотреть Сервисы..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_ЧаВО"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Фильтр:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "_Комната"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Иконка в трее (или в области уведомления)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Войти в Новую Комнату..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Выгнать"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "_История Сообщения"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_История изменений статуса контактов"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_Почтовый клиент:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Участник"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Объединить Учетные записи"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Сообщение"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Изменить"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Редактировать Учетную запись..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Имя: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Никогда"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Сообщать об этом"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Уведомить меня когда передача файлов завершена"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_ОК"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Действия над Посетителем"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Пользователи В Сети"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Отправить Письмо"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Просмотреть Ссылку в Браузере"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Владелец"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Пароль:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Проигрыватель:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Вывести окно"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Настройки"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Присутствие"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Опубликовать"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Выйти"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Удалить"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Удалить из Ростера"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "П_ереименовать"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Ответить"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Получить"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Поиск"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Отправить"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "Отправить и _Закрыть"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Отправить Личное Сообщение"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Отправить Сообщение Сервера"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "О_тправить Сообщение"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "Установить Картинку"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "Начать Чат"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Статус"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Подписаться"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Подписка"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Использовать прокси"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Имя пользователя:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Право Говорить"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML Консоль..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "список передач"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "минут"
 
@@ -3251,17 +3411,17 @@ msgstr "минут"
 msgid "Error: cannot open %s for reading"
 msgstr "Ошибка: не могу открыть %s для чтения"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Ошибка чтения файла:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 msgid "Error parsing file:"
 msgstr "Ошибка обработки файла:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "Не могу писать в %s. Управление Сессиями будет недоступно"
@@ -3299,92 +3459,102 @@ msgstr "Статус установлен в:  %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Статус установлен в: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Переключиться на %s"
+
+#: ../src/notify.py:145
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 msgstr "%(nickname)s из комнаты %(room_name)s отправил вам новое сообщение."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s отправил вам новое сообщение"
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s хочет отправит вам файл."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "Успешно получен файл %(filename)s от %(name)s."
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Передача файла %(filename)s от %(name)s приостановлена."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(name)s успешно получил отправленный вами файл %(filename)s."
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Передача файла %(filename)s к %(name)s приостановлена."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Объединенные учетные записи"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Сервер"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "Вы не можете зайти в комнату так как вы в режиме невидимости."
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Войти в Новую Комнату"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Управление Закладками..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "учетной записи %s"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "используя %s учетную запись"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "используя учетную запись %s"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "для учетной записи %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3392,67 +3562,67 @@ msgstr ""
 "У вас теперь не будет возможности приема и отправки сообщения контактам "
 "через этот транспорт."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP Ключ"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ который будет применен к контакту"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Вы не против если я добавлю Вас себе в ростер?"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "П_ереименовать"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Отключиться"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Изменить Сообщение о Статусе"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3460,28 +3630,28 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу чтобы этот контакт видел мой статус после удаления"
 
-#: ../src/roster_window.py:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Требуется Парольная Фраза"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Введите парольную фразу GPG ключа для %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3489,20 +3659,20 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать в невидимым?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Неи доступной учетной записи"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3510,30 +3680,30 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Изменить Сообщение о Статусе..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Изменить Сообщение о Статусе..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "используя учетную запись "
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Скрыть это меню"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 msgid "All contacts in this group are offline or have errors"
 msgstr "Все контакты в это группе отключены или имеют ошибки"
 
 #: ../src/systraywin32.py:278 ../src/systraywin32.py:297
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3541,53 +3711,7 @@ msgstr[0] "Gajim - %d непрочитанное сообщение"
 msgstr[1] "Gajim - %d непрочитанных сообщения"
 msgstr[2] "Gajim - %d непрочитанных сообщений"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "Ни %s не выдал OpenPGP ключ ни вы не присвоили ему такового"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Вы получили новое сообщение от \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
-"сообщений, то это сообщение будет потеряно."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
-"сообщений, то  сообщение будет потеряно."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Не удалось отправить личное сообщение"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Шифрование включено"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Шифрование отключено"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3595,7 +3719,7 @@ msgstr[0] "Gajim - %d непрочитанное одиночное сообще
 msgstr[1] "Gajim - %d непрочитанных одиночных сообщения"
 msgstr[2] "Gajim - %d непрочитанных одиночных сообщений"
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3603,7 +3727,7 @@ msgstr[0] "Gajim - %d непрочитанное сообщение в комн
 msgstr[1] "Gajim - %d непрочитанных сообщения в комнате"
 msgstr[2] "Gajim - %d непрочитанных сообщений в комнате"
 
-#: ../src/tooltips.py:285
+#: ../src/tooltips.py:284
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3611,86 +3735,86 @@ msgstr[0] "Gajim - %d непрочитанное личное сообщение
 msgstr[1] "Gajim - %d непрочитанных личных сообщения"
 msgstr[2] "Gajim - %d непрочитанных личных сообщения"
 
-#: ../src/tooltips.py:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Должность: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Ранг: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Размер: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Приостановлено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Передается"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Этот сервис еще не сообщил информацию о себе"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3704,24 +3828,24 @@ msgstr "Выбрать Аватару"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Размер файла изображения \"%s\" слишком велик"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Размер файла не должен превышать 32 килобайта."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3729,7 +3853,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3737,35 +3861,35 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации"
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Необходимо присоединиться к серверу для получения информации о контакте"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Редактировать Личную Информацию"
@@ -3774,25 +3898,26 @@ msgstr "Редактировать Личную Информацию"
 msgid "creating logs database"
 msgstr "создается БД истории"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s должен быть директорией, а не файлом"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Закончить работу"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "создается директория %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s должен быть файлом, а не директорией"
@@ -3815,38 +3940,38 @@ msgstr "На машине отсутствует D-Bus или модуль пи
 msgid "Session bus is not available"
 msgstr "D-Bus сервер недоступен"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Использовать DBus и Сервис Уведомлений для показа уведомлений"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Время в минутах, после которого ваш статус изменится на Отошел."
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Статус 'Отошел' ввиду отсутствия пользователя."
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Время в минутах, после которого ваш статус изменится на Недоступен."
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Статус 'Недоступен' ввиду отсутствия пользователя."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Если True, то не будут удаляться */_. Так что *фыва* будут написаны "
 "полужирным шрифтом, но * * удалены не будут"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Добавлять * и [n] в окно ростера?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3854,11 +3979,11 @@ msgstr ""
 "Сколько строк из предыдущей беседы выводить, когда вкладка/окно открываются "
 "вновь."
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "Сколько минут должны оставаться последние строки из предыдущей беседы."
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3866,20 +3991,20 @@ msgstr ""
 "Оправлять сообщения по Ctrl+Enter и Enter создает новую строку (как в "
 "Mirabilis ICQ)"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Сколько строк хранить для Ctrl+Стрелка вверх"
 
 #. which version created the config
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "Использовать компактный вид для окна беседы"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr "Использовать компактный вид для окна комнаты"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3888,19 +4013,23 @@ msgstr ""
 "Введите свою ссылку с %s, в которой %s подменяет слово/фразу или "
 "'WIKTIONARY', что значит: \"использовать wiktionary\"."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 "Если отмечено, то Gajim'ом можно будет управлять удаленно с использованием "
 "gajim-remote."
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "Спрашивать перед закрытием окна/вкладки комнаты."
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
@@ -3908,30 +4037,30 @@ msgstr ""
 "Указвает имя хоста, которое мы отсылаем при Передаче Файлов, в случае если "
 "мы за NAT или используется проброс портов."
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC утверждает что KiB = 1024 байт, KB = 1000 байт"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Показывать вкладку при одной беседе?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Показывать границу вкладки при одной беседе?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Показывать кнопку закрытия на вкладке?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 "Список слов с ; в качестве разделителя, которые будут выделяться в комнате."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3939,11 +4068,11 @@ msgstr ""
 "Если True, то Gajim будет завершаться при нажатии на кнопку закрытия окна. "
 "Эта опция учитывается только если используется иконка для трея."
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "Если True, то Gajim будет регистрировать xmpp:// при каждом запуске"
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3951,7 +4080,7 @@ msgstr ""
 "Если True, то Gajim иконку на каждой вкладке, которая содержит непрочитанные "
 "сообщения. В зависимости от темы, она может быть анимированной."
 
-#: ../src/common/config.py:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3959,7 +4088,7 @@ msgstr ""
 "Если True, то Gajim будет отображать сообщение о статусе, если оно не "
 "пустое, для каждого контакта под именем контакта в окне ростера"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:179
 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."
@@ -3967,8 +4096,8 @@ msgstr ""
 "Если True, то Gajim будет запрашивать аватару для каждого контакта у "
 "которого её не было в последний раз или она уже слишком старая."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3976,72 +4105,87 @@ msgstr ""
 "Если False, то вы больше не будете видеть статусную строку в окне беседы, "
 "когда контакт меняет его или её статус и/или сообщение о статусе."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Я кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Я в кино"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Я смотрю кино"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Я работаю"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Я говорю по телефону"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4050,7 +4194,7 @@ msgstr ""
 "содержит слово из списка muc_highlight_words, или когда сообщение содержит "
 "ваш ник."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4060,61 +4204,66 @@ msgstr ""
 "в True)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "зеленый"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "овошной"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "телесный"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "морской"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "чистый"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Не могу войти в комнату"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Не могу войти в комнату"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Для входа в комнату необходим пароль."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Вам запрещено заходить в эту комнату."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Такой комнаты не существует."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Запрещено созднание комнат."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Вы должны использовать свой зарегистрированный ник."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Вы не находитесь в списке участников."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4122,38 +4271,38 @@ msgstr ""
 "Ник, который вы указали уже используется другим посетителем.\n"
 "Пожалуйств, укажите другой ник ниже:"
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "%s отменил подписку с вами"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "запрос на отписку от %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s отменил подписку с вами"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Связь с учетной записью \"%s\" была потеряна"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4163,61 +4312,61 @@ msgstr ""
 "утилиты для управления ростером такими как http://jru.jabberstudio.org/ для "
 "того, чтобы его удалить"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Подключен к серверу %s: %s с %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 msgid "Please check your login and password for correctness."
 msgstr "Пожалуйста, проверьте правильность логина и пароля."
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "невидимка"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "отключен"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Я %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Это сообщения зашифровано]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4226,16 +4375,16 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Регистрационная информация для транспорта %s не пришла вовремя"
 
-#: ../src/common/connection.py:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Таймаут"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Произошла ошибка протокола:"
 
@@ -4357,10 +4506,6 @@ msgstr "_Невидимка"
 msgid "Invisible"
 msgstr "Невидимка"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Не в ростере"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "Неизвестен"
@@ -4448,10 +4593,38 @@ msgstr "закрыл окно чата или вкладку"
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
-#: ../src/common/optparser.py:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "синий"
 
+#~ msgid "account: "
+#~ msgstr "учетная запись: "
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Вы точно хотите покинуть комнаты \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Если вы закроете это окно, то вы выйдете из этих комнат."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Включить/Выключить уведомления о завершении передачи файла"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Удаляет выделенную передачу"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Останавливает выбранную передачу"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Использовать единое окно чата с _табами"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+#~ "сообщений, то  сообщение будет потеряно."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Не могу удалить последнюю группу"
 
diff --git a/po/sk/LC_MESSAGES/gajim.po b/po/sk/LC_MESSAGES/gajim.po
index cfef7f00dcdee16cc594109aaaaa49df945e6fa1..e51f16c61ce25f64fe64a30bab4f067fa740e816 100644
--- a/po/sk/LC_MESSAGES/gajim.po
+++ b/po/sk/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: 2005-12-18 13:31+0100\n"
 "Last-Translator: Juraj Michalek <juraj.michalek@asinus.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -24,9 +24,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "GTK+ Jabber klient"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -56,39 +55,8 @@ msgstr "(Nič)"
 msgid "Hidden"
 msgstr "Skrytý"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Rozhovor"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Skupinový rozhovor"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "účet:"
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "nie je v zozname"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Prepnúť na %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -105,221 +73,374 @@ msgstr ""
 "\n"
 "Zvýrazňovanie zle napísaných slov nebude používané"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "Pripojenie nie je dostupné"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Vašu správu nie je možné odoslať, pokiaľ nebudete pripojený(á)"
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "nie je v zozname"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Rozhovor"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP Å¡ifra"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s nemôže odoslať OpenPGP kľúč, musíte mu priradiť vlastný"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "Šifrovanie zapnuté"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Šifrovanie vypnuté"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, 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:1189
+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:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Každých %s _minút"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Aktívne"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Udalosť"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Zvuk"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "titulok správy o stave"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "text správy o stave"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav zvuk"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP nie je použiteľné na tomto počítači"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Práve ste pripojený na server"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "Pre zmenu mena účtu sa musíte byť odpojený."
 
-#: ../src/config.py:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Nesprávne meno účtu"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Meno účtu nemôže byť prázdne."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Meno účtu nemôže obsahovať medzery."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Nespravné Jabber ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabbe ID musí byť v tvare \"používateľ@menoserveru\""
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Nesprávny záznam"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Port musí byť číslo."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Žiadný účet nie je k dispozícii"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Bez pripojenia nemôžete meniť osobné informácie."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Nepodarilo sa vygenerovať tajné kľúče"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 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:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Passfráza"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Vyberte váš OpenPGP kľúč"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Žiadny kľúč nie je vybraný"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Meno"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Edit %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registrovať na %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_ÄŒlen"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Vlastník"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administrátor"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Vykopnúť"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Rola:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Zakázať %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Čo si prajete vykonať?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Čo si prajete vykonať?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Čo si prajete vykonať?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administrátor"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Čo si prajete vykonať?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Obrázok"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Vyberte obrázok"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstrániť %s účet"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" je pripojený na server"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Ak dôjde k odstráneniu, stratíte spojenie."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Uložiť heslo"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nová miestnosť"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Táto záložka obsahuje chybné údaje"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 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:2554
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "Nesprávne meno používateľa"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 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:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Nesprávne heslo"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "Musíte vložiť heslo pre nový účet."
 
-#: ../src/config.py:2589
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "Účet bol úspešne pridaný"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 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."
@@ -328,23 +449,23 @@ 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:2619
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "Váš nový účet bol vytvorený úspešne"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "Nastala chyba pri vytváraní účtu"
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Meno účtu je už používané"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Už máte účet s týmto menom."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
@@ -352,48 +473,48 @@ msgstr ""
 "Text pod touto čiarou bol povedaný v skupine pokiaľ ste jej nevenovali "
 "pozornosť rozhovoru v skupine"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Akcia pre \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Čítať článok na _Wikipédii"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Pozrieť sa do _Slovníka"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "Slovníkové URL chýba \"%s\" a nie je WIKTIONÁRNE"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pre web vyhľadávanie chýba \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "_Hľadať na webe"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "Včera"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "Pred %i dňami"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Predmet: %s\n"
@@ -419,12 +540,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transport"
 
@@ -478,45 +599,68 @@ msgstr "Kontakt je už zanesený v zozname."
 msgid "A GTK+ jabber client"
 msgstr "GTK+ jabber klient"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Juraj Michálek <juraj.michalek@asinus.org>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Požiadavka na prihlásenie účtu %s od %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Požiadavka na prihlásenie od %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Pripojiť do diskusnej skupiny s účtom %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Pripojiť do diskusnej skupiny"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Nesprávne meno používateľa"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Začať rozhovor s účtom %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "Začať rozhovor"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -525,137 +669,156 @@ msgstr ""
 "odoslať správu:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Pripojenie nie je dostupné"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím, uistite sa, že ste pripojený(á) k \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "Bez pripojenia nemôžete meniť heslo."
 
-#: ../src/dialogs.py:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Musíte vložiť heslo."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Heslá sa nezhodujú"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Heslá vložené do oboch polí musia byť rovnaké."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt sa pripojil"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontakt sa odpojil"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nová správa"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nová jednoduchá správa"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "Nová privátna správa"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "Od %s v miestnosti %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Požiadavka na prenos súboru"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Chyba pri prenose súboru"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Prenos súboru zastavený"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Pre %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-Mail"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "Máte neprečítané správy"
+msgstr[1] "Máte neprečítané správy"
+msgstr[2] "Máte neprečítané správy"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "Jednoduchá správa s účtom %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Jednoduchá správa"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Poslať %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s napísal:\n"
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konzola pre %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML konzola"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Boli ste pozvaný(á) do %(room_jid)s miestnosti - %(contact_jid)s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentár: %s"
@@ -702,11 +865,6 @@ msgstr "Tento typ služby neobsahuje žiadne položky na prechádzanie."
 msgid "Browsing %s"
 msgstr "Prechádzanie %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr "JID"
-
 #: ../src/disco.py:704
 msgid "_Browse"
 msgstr "_Prechádzať"
@@ -715,30 +873,30 @@ msgstr "_Prechádzať"
 msgid "This service does not contain any items to browse."
 msgstr "Táto služba neobsahuje žiadne položky."
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Pripojiť"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "Prieskum %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "Používatelia"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "Popis"
 
@@ -759,7 +917,7 @@ msgstr "Stav"
 msgid "Filename: %s"
 msgstr "Meno súboru: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Veľkosť: %s"
@@ -775,8 +933,8 @@ msgstr "Vy"
 msgid "Sender: %s"
 msgstr "Odosielateľ: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Príjemca:"
 
@@ -789,7 +947,7 @@ msgstr "Uložené do: %s"
 msgid "File transfer completed"
 msgstr "Prenos súboru dokončený"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Otvoriť adresár"
 
@@ -813,50 +971,55 @@ msgstr "Vyberte súbor na odoslanie..."
 msgid "Send"
 msgstr "Poslať"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim nemôže pracovať s týmto súborom"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "Tento súbor je používaný iným procesom."
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Tento súbor už existuje"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Čo si prajete vykonať?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Súbor: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Popis: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vám chce poslať súbor:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Uložiť ako..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Tento súbor už existuje"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -864,37 +1027,37 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "Nesprávny súbor"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "Súbor:"
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "Nie je možné poslať prázdne súbory"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Meno:"
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Odosielateľ:"
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Pauza"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Pokračovať"
 
@@ -1153,31 +1316,31 @@ msgstr ""
 "Argument \"%s\" nie je špecifikovaný. \n"
 "Zadajte \"%s help %s\" pre viac informácií"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "Gajim potrebuje Xserver pre svoj beh. Ukončenie..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim potrebuje PyGTK 2.6+ alebo novšiu"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 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:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim potrebuje GTK 2.6+ alebo novšia"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 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:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtimu chýba podpora libglade"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -1186,7 +1349,7 @@ msgstr ""
 "Prosím, odstráňte vašu aktuálnu verziu GTK+ prostredia a nainštalujte si "
 "poslednú stabilnú verziu z %s"
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 #, fuzzy
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
@@ -1194,77 +1357,77 @@ msgstr ""
 "Prosím, uistite sa, že gtk a pygtk majú podporu pre libglade vo vašom "
 "systéme."
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 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:184
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) Autorizácia pre %s (id: %s)"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Akceptujete túto požiadavku?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "chyba pri odosielaní"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Autorizácia akceptovaná"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, 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:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" vás odobral zo svojho zoznamu"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "Vždy uvidíte jeho alebo ju ako offline."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Spojenie s \"%s\" nie je možné nadviazať"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je teraz %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Vaša passfráza je nesprávna"
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálne ste pripojení(á) bez vášho OpenPGP kľúča."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr "zverejnenie vCard úspešné"
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobné informácie boli úspešne zverejnené."
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1273,35 +1436,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia."
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 #, fuzzy
 msgid "GUI Migration failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "Záznamy boli úspešne prenesené do databázy."
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 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:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "Presun záznamov histórie..."
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
 
@@ -1322,146 +1485,98 @@ msgstr "Nemôžete zmazať aktuálnu tému"
 msgid "Please first choose another for your current theme."
 msgstr "Prosím, vyberte najskôr inú tému."
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Ste si istý, že chcete opustiť miestnosti  \"%s\"?"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:152
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "Ak zatvoríte toto okno, budete odpojený(á) z týchto miestností."
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Odoslanie súkromnej správy sa nepodarilo"
 
-#. just in one room
-#: ../src/groupchat_window.py:155
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Ste si istý(á), že chcete opustiť miestnosť \"%s\"?"
-
-#: ../src/groupchat_window.py:156
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "Ak zatvoríte okno, budete odpojený(á) z tejto miestnosti."
+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_window.py:160
-msgid "Do _not ask me again"
-msgstr "Znovu sa už _nepýtať"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Skupinový rozhovor"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Táto miestnosť nemá nastavenú tému"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s bol vykopnutý: %(reason)s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, 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_window.py:460
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s bol zakázaný: %(reason)s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, 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_window.py:472
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "Teraz ste známy(a) ako %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s je známy(a) ako %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s odišiel"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s je teraz %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Zmena predmetu"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Prosím, špecifikujte nový predmet:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Zmena prezývky"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Prosím špecifikujte novú prezývku, ktorú chcete používať:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Záložka je už nastavená"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Miestnosť \"%s\" je už vo vašich záložkách."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Záložka bola úspešne pridaná"
-
-#: ../src/groupchat_window.py:601
-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."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "Pripojenie nie je dostupné"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-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/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Prezývka nenájdená: %s"
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr "%s nevyzerá ako správny JID"
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, fuzzy, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "Žiadny príkaz ako: /%s (ak chcete odoslať prefix s tým, čo hovoríte)"
 
-#: ../src/groupchat_window.py:957
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "Príkazy: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1473,19 +1588,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_window.py:965
+#: ../src/groupchat_control.py:947
 #, 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_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Použiteie: /%s, vyčistí textové okno."
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -1494,13 +1609,13 @@ msgstr ""
 "Použitie: /%s [dôvod], zatvorí aktuálnu záložku v okne a zobrazí "
 "zdôvodnenie, pokiaľ je špecifikované."
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, 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_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
@@ -1509,7 +1624,7 @@ msgstr ""
 "Použitie: /%s <JID> [dôvod], pozve JID do aktuálnej miestosti, prípadne sa "
 "zobrazí aj oddôvodnenie."
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -1518,7 +1633,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_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1528,7 +1643,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_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
@@ -1537,7 +1652,7 @@ msgstr ""
 "Použitie: /%s <akcia>, odošle akciu pre aktuálnu miestnosť. Používajte "
 "tretiu osobu. (napr. /%s exlodoval(a).)"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -1546,39 +1661,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_window.py:994
+#: ../src/groupchat_control.py:978
 #, 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_window.py:997
+#: ../src/groupchat_control.py:981
 #, 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_window.py:1000
+#: ../src/groupchat_control.py:984
 #, 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_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "Žiadne informácie s pomocou pre /%s"
 
+#: ../src/groupchat_control.py:1022
+#, 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:1023
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Znovu sa už _nepýtať"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Zmena predmetu"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Prosím, špecifikujte nový predmet:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Zmena prezývky"
+
+#: ../src/groupchat_control.py:1071
+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:1089
+msgid "Bookmark already set"
+msgstr "Záložka je už nastavená"
+
+#: ../src/groupchat_control.py:1090
+#, 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:1100
+msgid "Bookmark has been added successfully"
+msgstr "Záložka bola úspešne pridaná"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Vykopnúť %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Môžete špecifikovať dôvod:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Zakázať %s"
@@ -1737,42 +1899,38 @@ msgid "Accounts"
 msgstr "Účty"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Aktivovať/deaktivovať upozorňovanie pri dokončení penosu súboru"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "_Rozšírené akcie"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Pridať nový kontakt"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Pridať _kontakt"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Rozšírené"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Rozšírený editor na editovanie konfigurácie"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Po prezývke:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Po čase:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1782,62 +1940,62 @@ msgstr ""
 "Len pri písaní\n"
 "Vypnuté"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Povoliť _odosielanie informácie o operačnom systéme"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "Povoliť jemu/jej vidieť môj stav"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 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:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Tiež známy ako iChat štýl"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Vyžiadať správu o stave, keď som:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "Požiadať jeho/ju o súhlas pre zobrazenie stavu"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Požiadať:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Prideliť Open_PGP kľúč"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Automaticky _preč po:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automaticky _neprítomný(á) po:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Automaticky pripojiť"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1849,71 +2007,71 @@ msgstr ""
 "Vždy použiť aplikácie prostredia KDE ako predvolené\n"
 "Vlastné"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Automaticky autorizovať kontakt"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "Automatické pripojenie po strate spojenia"
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Pred prezývkou:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Pred časom:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Narodeniny:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Tučné"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "Vytvoriť vlastnú požiadavku"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "_Pripojiť Gajim pri štarte"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Zrušiť prenos súboru"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Zrušiť prenos vybraných súborov"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Zrušiť prenos vybraných súborov a odstrániť nekompletné súbory"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "Zme_niť hesla"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Zmeniť heslo"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Zmeniť _prezývku"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Zrušiť _predmet"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Zmeniť upozornen_ie na stav:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1923,7 +2081,7 @@ msgstr ""
 "spamuje/otravuje. Použitím tejto možnosti zablokujete všetky správy od "
 "kohokoľvek, koho nemáte v zozname."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1934,213 +2092,214 @@ msgstr ""
 "silné šifrované SSL spojenie. Gajim používa bežne TLS šifrovanie, pokiaľ je "
 "poskytované serverom. Pri povolení tejto vlastnosti bude TLS deaktivované."
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Vyberte _kľúč"
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Mesto:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "_Vyčistiť"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Kliknite pre zmenu hesla účtu"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "Kliknite pre vloženie emotikonu (Alt+E)"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Kliknite pre zistenie vlastností (ako MSN, ICQ transport) jabber serverov"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Kliknite pre zobrazenie predchádzajúcej konverzácie v miestnosti"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Kliknite pre zobrazenie poslednej konverzácie s kontaktom"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Spoločnosť:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Nastaviť _miestnosť"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "Pripojiť, keď stlačím Dokončiť"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Spojenie"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Kontaktné informácie"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Kontaktné _info"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "História konverzácie"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Krajina:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Základná _sada ikoniek:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Zmazať správu dňa (MOTD)"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Zmazať správu dňa"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Zmazať správy dňa"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "Zakázať"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Oddelenie:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "Zobraziť avatarov kontaktov v zozname"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "Zobraziť stavovú správu kontaktov v zozname"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Upraviť skupiny"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Upraviť osobné informácie..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Upraviť _Skupiny"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Upraviť emotikony"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Povoliť"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Vložte ešte raz pre potvrdenie:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Vložte nové heslo:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Udalosti"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Každých 5 _minút"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Extra adresa:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Priezvysko:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Prenos súborov"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Prenos _súborov"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Správca súborov:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "Štýl fontu:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "Odmietnuť zobraziť stav"
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Formát: YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "Často kladené otázky (FAQ - online)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "Ch_oď"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Úprava tém Gajimu"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
 "may have with a contact"
@@ -2148,7 +2307,7 @@ msgstr ""
 "Gajim môže odoslať a prijať meta-informácie vzťahujúce sa ku konverzácii s "
 "vašim kontaktom"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2156,7 +2315,7 @@ msgstr ""
 "Gajim automaticky zobrazí novo prijaté správy v okne alebo v záložke "
 "existujúceho okna"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2164,7 +2323,7 @@ msgstr ""
 "Gajim vás bude upozorňovať na nové správy cez popup v pravej spodnej časti "
 "obrazovky"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2172,7 +2331,7 @@ msgstr ""
 "Gajim vás bude upozorňovať cez popup v pravej spodnej časti obrazovky o "
 "kontaktoch, ktoré sa práve pripojili"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2180,69 +2339,69 @@ msgstr ""
 "Gajim vás bude upozorňovať popup v pravej spodnej časti obrazovky na "
 "kontakty, ktoré sa práve odpojili"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim bude len meniť ikony kontaktov, ktoré vám odoslali novú správu"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Pomocník - Tvorba účtu"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Všeobecné"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Meno:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Skupina:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP spojenie"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "Online pomoc"
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Skrývanie okien"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Domovská stránka:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Meno servera:"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Už mám účet a chcem ho používať"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Chcem si za_registrovať nový účet"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Chcem si ťa pridať do môjho kontakt listu."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať trayicon"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr "Ak je zaškrtnuté, Gajim bude zobrazovať avatarov v zozname"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
@@ -2250,15 +2409,15 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude zobrazovať správu o stave kontaktov pod menom v "
 "zozname"
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Ak je zaškrtnuté, Gajim sa pripojí do diskusnej skupiny pri štarte"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Ak je zaškrtnuté, Gajim si zapamätá heslo pre tento účet"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2266,7 +2425,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim si bude pamätať pozície a veľkosť zoznamu a "
 "diskusných okien na obrazovke a pri ďalšom spustení ich znova nastaví"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2274,7 +2433,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim nahradí ascii emotikony ako ':)' ekvivalentným "
 "grafickým obrázkom"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2282,7 +2441,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim bude posielať pakety na udržanie spojenia, čím sa "
 "predchádza vypršaniu platnosti spojenia, ktorého výsledkom je odpojeni"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
 "permission only for you"
@@ -2290,7 +2449,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim uloží heslo do ~/.gajim/config s oprávnením 'čitať' "
 "len pre vás"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2300,7 +2459,7 @@ msgstr ""
 "kontakt z MSN bude mať ekvivalentné ikonky pre stavy online, preč, "
 "zaneprázdnený, atď...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2308,7 +2467,7 @@ msgstr ""
 "Ak je zaškrtnuté, Gajim sa pri spustení automatický pripojí na jabber na "
 "tento účet"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -2317,7 +2476,7 @@ msgstr ""
 "Ak je zaškrtnuté, každá zmena globálneho stavu (realizovaná rozbaľovacím "
 "menu na spodku zoznamu) spôsobí zmenu stavu aj v tomto účte"
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2325,167 +2484,180 @@ msgstr ""
 "Ak máte dva alebo viac účtov a je zaškrtnuté, Gajim bude vypisovať všetky "
 "kontakty akoby ste mali len jeden účet"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Prichádzajúca správa:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Požiadavka"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "Informácie o vás sú uložené na serveri"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "Prijaté pozvanie"
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Kurzíva"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "_Pripojiť sa k skupinovej diskusii"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Miesto"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Upraviť účty"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Upraviť záložky"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Upraviť emotikony"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Upraviť Proxy nastavenia"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Upraviť..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Prostredné meno:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derátor"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Viac"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Meno:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Prezývka:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Nič"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Upozorni ma na kontakt, ktorý:"
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "Operačný systém:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Pri každej _správe"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Poslať správu a zatvoriť okno"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Otvoriť..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP Å¡ifra"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Alebo vyberte jednu zo správ:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Odchádzajúca správa:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "He_slo:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Heslo"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "Osobné informácie"
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefónne č.:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "Prehrať _zvuky"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Pozícia:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "PSČ:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Nastavenia"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Čas tlače:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priori_ta:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -2495,63 +2667,59 @@ msgstr ""
 "pripojených dvaja alebo viac klientov prostredníctvom jedného účtu; Klient s "
 "najvyššou priritou obdrží udalosť"
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, Avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokol:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "Zostaviť požiadavku..."
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Posledné:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrovaný(á) k"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "_Odstrániť účet iba z Gajima"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "Odstrániť účet z Gajima a zo _serveru"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Odstrániť prenos súboru zo zoznamu"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Odstraňovanie vybraných prenosov súborov"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Odpoveď na túto správu"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Návrat Pôvodného nastavenia farieb"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Zd_roj:"
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2565,217 +2733,213 @@ 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:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Zdroj:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Rola:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Konfigurácia miestnosti"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Miestnosť:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Uložiť _passfrázy (nie je bezpečné)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Uložiť _záznam z rozhovoru pre všetky účty"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Uložiť hes_lo"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "_Hľadať"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Poš_li"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Poslať súbor"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Poslať jednoduchú _správu"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Poslať _súbor"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "Poslať _novú správu..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Poslať pakety na udržiavanie spojenia (keep-alive)"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Poslať správu"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Poslať správu a zatvoriť okno"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Vlastnosti servera"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Nastaviť správu dňa"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Nastaviť správu dňa"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Nastaviť _avatara"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "Nastaviť avatara, keď som pripojený(á)"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Nastavovať správu dňa"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "Zobraziť všetky čakajúce _udalosti"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Zobraziť _offline kontakty"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "Zobraziť _zoznam"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "Zobraziť _XML konzolu"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Zobraziť len v _zozname"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "Prihlásiť _sa"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "_Odhlásiť sa"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Zotriediť kontakty podľa stavu"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "S_tav"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Začať _rozhovor"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Stav"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Správa o stave:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Stav:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Zastavovanie vybraných prenosov súborov"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Ulica:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Predmet:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Požiadavka o zapísanie"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Zápis:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Titul za:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Syhch_ronizovať stav účtu s globálnym stavom"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "Farba _textu:"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "_Písmo:"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Správa pri automatickej zmene stavu na Preč"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Správa pri automatickej zmene stavu na Neprítomný(á)"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Téma:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2783,79 +2947,75 @@ msgstr ""
 "Táto akcia odstráni jeden prenos súborov zo zoznamu. Ak je prenos aktívny, "
 "je najskôr zastavený a potom odstránený"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titul:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Pre:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Zapnúť Open_PGP šifrovanie"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "Zadajte vašu novú správu o stave:"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Podčiarknutie"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Aktualizovať Správu dňa"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Aktualizovať Správu dňa"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Aktualizovať Správy dňa"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Použiť _SSL (historické dôvody)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Použiť _emotikony"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Použiť _transportnú sadu obrázkov"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Použiť jedno okno na rozhovor so _záložkami"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Použiť autentifikáciu"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Použiť vlastné nastavenie server/port"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Používateľské ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 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:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2867,15 +3027,15 @@ msgstr ""
 "Upozornenie na nové správy sa zobrazí len v prípade, že s kontaktom práve "
 "nediskutujete"
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "Keď je prijatá nová udalosť"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Práca"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2883,346 +3043,346 @@ msgstr ""
 "Potrebujete mať účet, aby ste sa mohli pripojiť\n"
 "do Jabbrovskej siete."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Vaše JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Akcie"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Pridať kontakt..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Pridať do zoznamu"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adresa:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administrátor"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Rozšírené"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Autorizovať"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "_Pozadie:"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Zakázať"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "_Uložiť do záložiek túto miestnosť"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Prechádzať:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Kompaktný pohľad    Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "_Obsah dokumentácie"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Skopírovať JID/E-mailovú adresu"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Skopírovať odkaz"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Zakázať"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "_Preskúmať služby..."
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "_Často kladené otázky"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_História"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikonka v paneli (tj. v upozorňovacej oblasti)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktorí nie sú v zozname"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "_Pripojiť sa do novej miestnosti..."
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Vykopnúť"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "História _konverzácie"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "_Zaznamenať zmenu stavu kontaktu"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_E-mailový klient:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_ÄŒlen"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "_Zlúčiť účty"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Správa"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Upraviť"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "_Upraviť účet..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Meno:"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Upozorni ma na to"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Upozorni ma, keď sa dokončí prenos"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Akcie člena"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Onlien používatelia"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Otvoriť nový e-mail"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Otvoriť vo web prehliadači"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Vlastník"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Heslo:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Pauza"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Prehrávač:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Popup"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Nastavenia"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Prítomnosť"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Zverejniť"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Koniec"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "_Odstrániť"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "_Odstrániť zo zoznamu"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Odpovedať"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Získať"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "_Hľadať"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Poslať"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Poslať a zatvoriť"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Poslať súkromnú správu"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Poslať serverovú správu"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Poslať jednoduchú správu"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Nastaviť obrázok..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Začať rozhovor"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Stav"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Zapísať"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Požiadavky"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Použiť proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Používateľské meno"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Hlas"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML konzola"
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "zoznam prenosu súborov"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minuty"
 
@@ -3232,17 +3392,17 @@ msgstr "minuty"
 msgid "Error: cannot open %s for reading"
 msgstr "Chyba: nie je možné otvoriť %s na čítanie"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "Chyba čítania súboru:"
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 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:300
+#: ../src/gtkgui_helpers.py:294
 #, 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ť."
@@ -3280,92 +3440,102 @@ msgstr "Stav je teraz: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Stav je teraz: %(status)s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Prepnúť na %s"
+
+#: ../src/notify.py:145
 #, 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."
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s vám poslal(a) správu."
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s chce vám poslať súbor."
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, 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/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Prenos súboru %(filename)s od %(name)s zastavený."
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, 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/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Prenos súboru %(filename)s pre %(name)s zastavený."
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "Spojiť účty"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Už ste v miestnosti %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 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:486
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "_Pripojiť do novej miestnosti"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Spravovať záložky..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "pre %s účet"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "použiť %s účet"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "pre účet %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude odstránený"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
 "this transport."
@@ -3373,67 +3543,67 @@ msgstr ""
 "Už nebudete môcť prijímať a odosielať správy k tomuto kontaktu cez tento "
 "transport."
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Priradiť OpenPGP kľúč"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Vybrať kľúč a aplikovať ho na kontakt"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "Chce si vás pridať do svojho zoznamu"
 
-#: ../src/roster_window.py:1045
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "Preme_novať"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Prihlásiť"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "_Odhlásiť"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz  bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, 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:1274
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, 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:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3441,28 +3611,28 @@ 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:1422
+#: ../src/roster_window.py:1441
 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:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Vložiť passfrázu GPG kľúč pre účet %s"
 
-#: ../src/roster_window.py:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Uložiť passfrázu"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 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:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3471,49 +3641,49 @@ msgstr ""
 "skupinových diskusií. Ste si skutočne istý(á), že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 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:2663
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "Zmeniť Správu o stave..."
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 msgid "_Change Status Message..."
 msgstr "_Zmeniť správu o stave..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "použiť účet"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 msgid "Hide this menu"
 msgstr "Ukryť toto menu"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, python-format
 msgid "Gajim - %d unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3521,51 +3691,7 @@ msgstr[0] "Gajim - %d neprečítaná správa"
 msgstr[1] "Gajim - %d neprečítaných správ"
 msgstr[2] ""
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s nemôže odoslať OpenPGP kľúč, musíte mu priradiť vlastný"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Práve ste prijali(a) novú správu od \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-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/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Ak zatvoríte túto záložku a máte deaktivovanú históriu, správa bude stratená."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Odoslanie súkromnej správy sa nepodarilo"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Nie ste už pripojený(á) to miestnosti \"%s\" alebo \"%s\" odišiel(a)."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Šifrovanie zapnuté"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Šifrovanie vypnuté"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
@@ -3573,7 +3699,7 @@ msgstr[0] "Gajim - %d neprečítaná jednoduchá správa"
 msgstr[1] "Gajim - %d neprečítané jednoduché správy"
 msgstr[2] ""
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
@@ -3581,7 +3707,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:285
+#: ../src/tooltips.py:284
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
@@ -3589,86 +3715,86 @@ 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:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Rola:"
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Pripojenie:"
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Stav:"
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Zdroj:"
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Zápis:"
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Veľkosť:"
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Prenesené:"
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Nezačal"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Zastavený"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Dokončený"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pauza"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Uviaznutý"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Prenášanie"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr "Táto služba neodpovedala podrobnejšími informáciami"
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3682,24 +3808,24 @@ msgstr "Vybrať avatara"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Obrázok \"%s\" je príliš veľký"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Súbor nemôže mať viac než 32 kilobatov."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -3707,7 +3833,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:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -3715,14 +3841,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:296
+#: ../src/vcard.py:293
 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:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -3730,23 +3856,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:307
+#: ../src/vcard.py:304
 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:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr "priorita zdroja"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Osobné informácie"
@@ -3755,25 +3881,26 @@ msgstr "Osobné informácie"
 msgid "creating logs database"
 msgstr "vytváranie záznamov databáz"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s je súbor, ale mal by to byť adresár"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim bude ukončený"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "vytvorenie %s adresára"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s je adresár, ale mal by byť súbor"
@@ -3796,38 +3923,38 @@ msgstr "D-Bus nie je prítomný na tomto stroji alebo chýba modul pre Python"
 msgid "Session bus is not available"
 msgstr "Session bus nie je prístupný"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "Použiť DBus a Notification-Daemon pre zobrazenie upozornení"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 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:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Preč ako výsledok nečinnosti"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 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:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Neprítomný(á) ako výsledok nečinnosti"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 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:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "Pridať * a [n] do titulku zoznamu?"
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3835,11 +3962,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:127
+#: ../src/common/config.py:135
 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:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3847,20 +3974,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:130
+#: ../src/common/config.py:138
 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:132
+#: ../src/common/config.py:140
 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:133
+#: ../src/common/config.py:141
 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:135
+#: ../src/common/config.py:143
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3869,40 +3996,44 @@ msgstr ""
 "Ani url s %s kde je %s slovo/fráza alebo 'WIKTIONARY' čo znamená použitie "
 "wiktionary."
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 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:142
+#: ../src/common/config.py:150
 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:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 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:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC štandard znamná KiB = 1024 bajtov, KB = 1000 bajtov."
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "Ukázať záložku len ak prebieha konverzácia?"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "Zobraziť okraj ak niekto konverzuje?"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "Zobraziť zatváracie tlačidlo v záložke?"
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
@@ -3910,7 +4041,7 @@ msgstr ""
 "Bodkočiarkou oddelený zoznam slov bude zvýraznený rozhovore s viacerými "
 "používateľmi."
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3918,11 +4049,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:164
+#: ../src/common/config.py:175
 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:165
+#: ../src/common/config.py:176
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3930,7 +4061,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:166
+#: ../src/common/config.py:177
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
 "contact under the contact name in roster window"
@@ -3938,7 +4069,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:168
+#: ../src/common/config.py:179
 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."
@@ -3946,8 +4077,8 @@ msgstr ""
 "Ak je pravda, Gajim si vyžiada avatara, pre každý kontakt, ktorý nemá "
 "avatara z posledného spojenia, alebo ak nie je cache príliš zastaralá."
 
-#. FIXME: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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."
@@ -3955,72 +4086,87 @@ msgstr ""
 "Ak nie je pravda, nebudete vidieť riadok o zmene stavu kontaktu a jeho/jej "
 "stavovú správu"
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Spiaci"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Hneď som späť"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Som späť za pár minút."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Jedlo"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Práve jem, prosím nechajte mi odkaz."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Pozerám film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Pracujem"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Pracujem."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefón"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Mám hovor."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Vonku"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Šiel som von užívať si život."
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
@@ -4028,7 +4174,7 @@ msgstr ""
 "Prehrať zvuk keď MUC správa obsahuje slová, ktoré sú v moc_highlihgt_words, "
 "alebo keď MUC správa obsahuje vašu prezývku."
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
@@ -4037,61 +4183,66 @@ msgstr ""
 "na účet, ak notify_on_all_muc_message je pravda)"
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "zelená"
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "obchod s potravinami"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "človek"
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "námornícka"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "jednoduchá"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Nie je možné vstúpiť do miestnosti"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Nie je možné vstúpiť do miestnosti"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "Pre vstup do miestnosti je požadované heslo."
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "Vstup do miestnosti vám bol zakázaný."
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "Takáto miestnosť neexistuje."
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "Vytváranie miestností je obmedzené."
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "Musíte použiť vašu zaregistrovanú prezývku."
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "Nie ste v zozname."
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -4099,39 +4250,39 @@ 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:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "sme prihlásení k %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "požiadavka na odhlásenie od %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "sme odhlásení od %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Spojenie s účtom \"%s\" bolo stratené"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, fuzzy, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4141,61 +4292,61 @@ msgstr ""
 "nástroje na správu zoznamu, napríklad: http://jru.jabberstudio.org/ pre jeho "
 "odstránenie"
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie je možné pripojiť sa k \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Pripojený na server %s:%s s %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Skontrolujte svoje pripojenie alebo skúste neskôr"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentifikácia bola neúspešná s \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passfráza nebola zadaná"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "neviditeľný"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "offline"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Som %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Táto správa je šifrovaná]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4204,16 +4355,16 @@ msgstr ""
 "Predmet: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, 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:2354
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "Čas vypršal"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "Objavila sa chyba v protokole:"
 
@@ -4335,10 +4486,6 @@ msgstr "_Neviditeľný"
 msgid "Invisible"
 msgstr "Neviditeľný"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Nie je v zozname"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?kontakt má stav:Neznámy"
@@ -4426,10 +4573,38 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "azúrová"
 
+#~ msgid "account: "
+#~ msgstr "účet:"
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Ste si istý, že chcete opustiť miestnosti  \"%s\"?"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "Ak zatvoríte toto okno, budete odpojený(á) z týchto miestností."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Aktivovať/deaktivovať upozorňovanie pri dokončení penosu súboru"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Odstraňovanie vybraných prenosov súborov"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Zastavovanie vybraných prenosov súborov"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Použiť jedno okno na rozhovor so _záložkami"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Ak zatvoríte túto záložku a máte deaktivovanú históriu, správa bude "
+#~ "stratená."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Nie je možné odstrániť poslednú skupinu"
 
@@ -4497,9 +4672,6 @@ msgstr "azúrová"
 #~ msgid "Chat with"
 #~ msgstr "Rozprávať sa s"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-Mail"
-
 #~ msgid "Send New Message"
 #~ msgstr "Poslať novú správu"
 
diff --git a/po/sv/LC_MESSAGES/gajim.po b/po/sv/LC_MESSAGES/gajim.po
index c9d0a67bfd6b58e68290f45df5c1a6957d74f9b3..f4d07ac88da9c0b5ac80ce58e8b5666e35818828 100644
--- a/po/sv/LC_MESSAGES/gajim.po
+++ b/po/sv/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-03 13:52+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -24,9 +24,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "En GTK jabberklient"
 
-#. in seconds
-#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:137 ../src/notify.py:212
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -59,39 +58,8 @@ msgstr "Ingen"
 msgid "Hidden"
 msgstr "Mellannamn:"
 
-#: ../src/chat.py:186 ../src/gtkgui.glade.h:82
-msgid "Chat"
-msgstr "Chatt"
-
-#: ../src/chat.py:188 ../src/gtkgui.glade.h:149
-msgid "Group Chat"
-msgstr "Gruppchatt"
-
-#. if we have 2 or more accounts
-#: ../src/chat.py:202
-msgid "account: "
-msgstr "konto: "
-
-#. Check if jid is already in roster
-#. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:467 ../src/conversation_textview.py:376
-#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
-#: ../src/dialogs.py:947 ../src/gajim.py:529 ../src/gajim.py:530
-#: ../src/roster_window.py:991 ../src/roster_window.py:1262
-#: ../src/roster_window.py:1435 ../src/roster_window.py:1685
-#: ../src/roster_window.py:1720 ../src/roster_window.py:2141
-#: ../src/roster_window.py:2390 ../src/roster_window.py:2392
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-msgid "Not in Roster"
-msgstr "inte i registret"
-
-#: ../src/chat.py:555
-#, python-format
-msgid "Switch to %s"
-msgstr "Växla till %s"
-
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:784 ../src/dialogs.py:1021
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
 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 "
@@ -107,223 +75,378 @@ msgstr ""
 "\n"
 "Funktionen \"markera felstavade ord\" kommer inte att användas"
 
-#: ../src/config.py:184 ../src/config.py:427
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "En förbindelse är inte tillgänglig"
+
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
+
+#. Check if jid is already in roster
+#. Groups maynot change name from or to 'Not in Roster'
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
+msgid "Not in Roster"
+msgstr "inte i registret"
+
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "Chatt"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP kryptering"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr ""
+"%s har inte skrikit ut en OpenPGP-nyckel, inte heller har du tilldelat en"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "Kryptering påslaget"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "Kryptering avslagen"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
+#, python-format
+msgid "You just received a new message from \"%s\""
+msgstr "Du mottog just ett meddelande från \"%s\""
+
+#: ../src/chat_control.py:1189
+msgid ""
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Om du stänger den här tabben och du har historik avslaget kommer meddelandet "
+"att förloras."
+
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "Var %s _minuter"
 
-#: ../src/config.py:305
+#: ../src/config.py:313
 msgid "Active"
 msgstr "Verksam"
 
-#: ../src/config.py:313
+#: ../src/config.py:321
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:319
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "Ljud"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:921
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
-#: ../src/config.py:972
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/config.py:985 ../src/config.py:2058 ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/config.py:990
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav ljud"
 
-#: ../src/config.py:1151
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP är inte användbart i den här datorn"
 
-#: ../src/config.py:1175
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1109
 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:1179 ../src/config.py:1183
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1180
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1184
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1192 ../src/config.py:1198 ../src/config.py:1207
-#: ../src/config.py:2572
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/config.py:1199
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara i formen \"användare@server\"."
 
-#: ../src/config.py:1253
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:1353
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:1354
+#: ../src/config.py:1287
 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:1361 ../src/dialogs.py:657 ../src/dialogs.py:773
-#: ../src/disco.py:420 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:1362
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Utan en förbindelse kan du inte redigera din personliga information."
 
-#: ../src/config.py:1393
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:1394
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det var problem med att hämta dina hemliga OpenPGP-nycklar."
 
-#: ../src/config.py:1397 ../src/gtkgui.glade.h:205
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "Lösenfras"
 
-#: ../src/config.py:1398
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:1406 ../src/gtkgui.glade.h:194
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
 #. Name column
-#: ../src/config.py:1625 ../src/disco.py:678 ../src/disco.py:1416
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
 #: ../src/history_window.py:86
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1628
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "Server"
 
-#: ../src/config.py:1915
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:1917
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
-#: ../src/config.py:1936
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "_Medlem"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "_Ägare"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "_Administratör"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr ""
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "_Sparka ut"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "Roll:"
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "Bannlyser %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>Vad vill du?</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>Vad vill du?</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>Vad vill du?</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "_Administratör"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>Vad vill du?</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "Text"
 
-#: ../src/config.py:1944
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/config.py:2046
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "Välj bild"
 
-#: ../src/config.py:2063 ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2158
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2165
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen förloras."
 
-#: ../src/config.py:2175 ../src/roster_window.py:1465
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#: ../src/config.py:2176 ../src/roster_window.py:1466
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för kontot %s"
 
-#: ../src/config.py:2177 ../src/roster_window.py:1467
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2306
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "Nytt rum"
 
-#: ../src/config.py:2336
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2337
+#: ../src/config.py:2433
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Se till att fylla i server- och rumfälten eller ta bort det här bokmärket."
 
-#: ../src/config.py:2554
+#: ../src/config.py:2650
 #, fuzzy
 msgid "Invalid username"
 msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:2555
+#: ../src/config.py:2651
 #, fuzzy
 msgid "You must provide a username to configure this account."
 msgstr "Du behöver ange ett användarnamn för att lägga till ett konto."
 
-#: ../src/config.py:2563 ../src/dialogs.py:792
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2660
 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:2589
+#: ../src/config.py:2685
 #, fuzzy
 msgid "Account has been added successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/config.py:2590 ../src/config.py:2620
+#: ../src/config.py:2686 ../src/config.py:2716
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing Advanced button, or later "
@@ -333,71 +456,71 @@ msgstr ""
 "Du kan ställa in avancerade alternativ genom att använda \"Redigera->Konton"
 "\" från huvudfönstret."
 
-#: ../src/config.py:2619
+#: ../src/config.py:2715
 #, fuzzy
 msgid "Your new account has been created successfully"
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/config.py:2634
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr ""
 
-#: ../src/config.py:2711
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:2712
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/conversation_textview.py:183
+#: ../src/conversation_textview.py:181
 msgid ""
 "Text below this line is what has been said since the last time you paid "
 "attention to this group chat"
 msgstr ""
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia artikel"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _uppslagsbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsök saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "Webb_sök efter det"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr ""
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
@@ -423,12 +546,12 @@ msgstr "JID: <i>%s</i>"
 
 #. if not '@' or '@' starts the jid ==> agent
 #: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
-#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1199
-#: ../src/roster_window.py:153 ../src/roster_window.py:167
-#: ../src/roster_window.py:194 ../src/roster_window.py:208
-#: ../src/roster_window.py:2386 ../src/roster_window.py:2388
-#: ../src/roster_window.py:2485 ../src/roster_window.py:2493
-#: ../src/systray.py:243
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
 msgid "Transports"
 msgstr "Transporter"
 
@@ -487,45 +610,68 @@ msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 msgid "A GTK+ jabber client"
 msgstr "En GTK jabberklient"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:470
+#: ../src/dialogs.py:477
 msgid "translator-credits"
 msgstr "Christian Bjälevik <nafallo@magicalforest.se>"
 
-#: ../src/dialogs.py:611
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prenumerationsförfrågan för konto %s från %s"
 
-#: ../src/dialogs.py:614
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:658
+#: ../src/dialogs.py:688
 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:669
+#: ../src/dialogs.py:701
 #, fuzzy, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt som %s"
 
-#: ../src/dialogs.py:671 ../src/gtkgui.glade.h:180
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "Anslut till gruppchatt"
 
-#: ../src/dialogs.py:751
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "Ogiltigt användarnamn"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, fuzzy, python-format
 msgid "Start Chat with account %s"
 msgstr "för konto %s"
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:814
 #, fuzzy
 msgid "Start Chat"
 msgstr "_Starta chatt"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -534,138 +680,156 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:762 ../src/dialogs.py:1143 ../src/dialogs.py:1263
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "Förbindelse inte tillgänglig"
 
-#: ../src/dialogs.py:763 ../src/dialogs.py:1144 ../src/dialogs.py:1264
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:774
+#: ../src/dialogs.py:835
 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:793
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:797
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
-#: ../src/dialogs.py:832 ../src/gajim.py:358 ../src/notify.py:134
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "Kontakt loggade in"
 
-#: ../src/dialogs.py:837 ../src/gajim.py:377 ../src/notify.py:137
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "Kontakt loggade ut"
 
 #. chat message
-#: ../src/dialogs.py:842 ../src/gajim.py:458 ../src/notify.py:140
-#: ../src/notify.py:152
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "Nytt meddelande"
 
 #. single message
-#: ../src/dialogs.py:842 ../src/gajim.py:456 ../src/notify.py:140
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "Nytt enstaka meddelande"
 
-#: ../src/dialogs.py:843 ../src/dialogs.py:847 ../src/gajim.py:412
-#: ../src/notify.py:141 ../src/notify.py:143
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 #, fuzzy
 msgid "New Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../src/dialogs.py:850
+#: ../src/dialogs.py:935
 #, fuzzy, python-format
 msgid "From %s in room %s"
 msgstr "%s är nu %s"
 
-#: ../src/dialogs.py:852 ../src/dialogs.py:858 ../src/dialogs.py:876
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "Från %s"
 
-#: ../src/dialogs.py:854 ../src/gajim.py:876 ../src/notify.py:156
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "Förfrågan om filöverföring"
 
 #. check if we should be notified
-#: ../src/dialogs.py:860 ../src/gajim.py:801 ../src/gajim.py:858
-#: ../src/notify.py:161
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "Fel i filöverföring"
 
-#: ../src/dialogs.py:865 ../src/gajim.py:907 ../src/notify.py:164
-#: ../src/notify.py:173 ../src/notify.py:190
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "Filöverföring klar"
 
-#: ../src/dialogs.py:866 ../src/gajim.py:910 ../src/notify.py:164
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "Filöverföring stoppad"
 
-#: ../src/dialogs.py:885
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "Till %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+#, fuzzy
+msgid "New E-mail"
+msgstr "E-post"
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "Du har olästa meddelanden"
+msgstr[1] "Du har olästa meddelanden"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1075
+#: ../src/dialogs.py:1181
 #, fuzzy, python-format
 msgid "Single Message with account %s"
 msgstr "Enstaka meddelande som %s"
 
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1080
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1103
+#: ../src/dialogs.py:1209
 #, 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:1169
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1170
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr ""
 
-#: ../src/dialogs.py:1214
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML konsoll för %s"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr "XML konsole"
 
-#: ../src/dialogs.py:1299
+#: ../src/dialogs.py:1405
 #, fuzzy, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "Du har blivit inbjuden till rummet %s av %s"
 
-#: ../src/dialogs.py:1302
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -712,11 +876,6 @@ msgstr ""
 msgid "Browsing %s"
 msgstr "Version %s"
 
-#. Address column
-#: ../src/disco.py:685
-msgid "JID"
-msgstr ""
-
 #: ../src/disco.py:704
 #, fuzzy
 msgid "_Browse"
@@ -726,31 +885,31 @@ msgstr "_Webbläsare:"
 msgid "This service does not contain any items to browse."
 msgstr ""
 
-#: ../src/disco.py:1090 ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1098 ../src/disco.py:1457 ../src/gtkgui.glade.h:348
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "_Anslut till"
 
-#: ../src/disco.py:1202 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1087
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "R_edigera"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr ""
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 #, fuzzy
 msgid "Users"
 msgstr "Användar-ID:"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 #, fuzzy
 msgid "Description"
 msgstr "Beskrivning: %s"
@@ -773,7 +932,7 @@ msgstr "Förlopp"
 msgid "Filename: %s"
 msgstr "Filnamn: %s"
 
-#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, python-format
 msgid "Size: %s"
 msgstr "Storlek: %s"
@@ -789,8 +948,8 @@ msgstr "Du"
 msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
-#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:543
-#: ../src/tooltips.py:491
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
+#: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "Mottagare: "
 
@@ -803,7 +962,7 @@ msgstr "Sparad i: %s"
 msgid "File transfer completed"
 msgstr "Filöverföring färdig"
 
-#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:366
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "_Öppna behållande mapp"
 
@@ -827,50 +986,55 @@ msgstr "Välj fil att skicka..."
 msgid "Send"
 msgstr "Sänd"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr ""
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr ""
 
-#: ../src/filetransfers_window.py:309
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "Den här filen finns redan"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>Vad vill du?</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:314
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "Beskrivning: %s"
 
-#: ../src/filetransfers_window.py:317
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:320
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "Spara fil som..."
 
-#: ../src/filetransfers_window.py:341
-msgid "This file already exists"
-msgstr "Den här filen finns redan"
-
-#: ../src/filetransfers_window.py:342
+#: ../src/filetransfers_window.py:364
 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:414
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr ""
@@ -878,40 +1042,40 @@ 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:469
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr ""
 
-#: ../src/filetransfers_window.py:515 ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 #, fuzzy
 msgid "Invalid File"
 msgstr "Ogiltig post"
 
-#: ../src/filetransfers_window.py:515
+#: ../src/filetransfers_window.py:537
 #, fuzzy
 msgid "File: "
 msgstr "Fil: %s"
 
-#: ../src/filetransfers_window.py:519
+#: ../src/filetransfers_window.py:541
 #, fuzzy
 msgid "It is not possible to send empty files"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:539 ../src/tooltips.py:408
-#: ../src/tooltips.py:473
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
+#: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:541 ../src/tooltips.py:486
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "Sändare: "
 
-#: ../src/filetransfers_window.py:729
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/filetransfers_window.py:740 ../src/gtkgui.glade.h:328
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "_Fortsätt"
 
@@ -1182,115 +1346,115 @@ msgstr ""
 "Parameter \"%s\" är inte specificerad. \n"
 "Skriv \"%s help %s\" för mer info"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr ""
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr ""
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr ""
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr ""
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
 "version from %s"
 msgstr ""
 
-#: ../src/gajim.py:62
+#: ../src/gajim.py:66
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr ""
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr ""
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:184
+#: ../src/gajim.py:187
 #, fuzzy, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) auktorisering för %s"
 
-#: ../src/gajim.py:185
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gajim.py:505
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "problem vid sändning"
 
-#: ../src/gajim.py:546
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:547
+#: ../src/gajim.py:557
 #, fuzzy, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans status."
 
-#: ../src/gajim.py:553
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:554
+#: ../src/gajim.py:565
 #, fuzzy
 msgid "You will always see him or her as offline."
 msgstr "Du kommer alltid se honom som offline."
 
-#: ../src/gajim.py:578
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:579 ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din förbindelse eller försök igen senare."
 
-#: ../src/gajim.py:688 ../src/roster_window.py:725
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s är nu %s (%s)"
 
-#: ../src/gajim.py:745
+#: ../src/gajim.py:777
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:746
+#: ../src/gajim.py:778
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr ""
 
-#: ../src/gajim.py:942
+#: ../src/gajim.py:1002
 #, fuzzy
 msgid "Your personal information has been published successfully."
 msgstr "Bokmärke har blivit ordentligt tillagt"
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:945
+#: ../src/gajim.py:1005
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1298,35 +1462,35 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1233
+#: ../src/gajim.py:1296
 #, fuzzy
 msgid "Could not save your settings and preferences"
 msgstr "Kan inte spara dina inställningar"
 
-#: ../src/gajim.py:1429
+#: ../src/gajim.py:1502
 msgid "GUI Migration failed"
 msgstr ""
 
-#: ../src/gajim.py:1432
+#: ../src/gajim.py:1505
 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:1440
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr ""
 
-#: ../src/gajim.py:1459
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr ""
 
-#: ../src/gajim.py:1514
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 
@@ -1347,151 +1511,98 @@ msgstr ""
 msgid "Please first choose another for your current theme."
 msgstr ""
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:151
-#, fuzzy, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
-
-#: ../src/groupchat_window.py:152
-#, fuzzy
-msgid "If you close this window, you will be disconnected from these rooms."
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
 msgstr ""
-"Om du stänger det här fönstret kommer du bli frånkopplad från det här rummet."
 
-#. just in one room
-#: ../src/groupchat_window.py:155
-#, fuzzy, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "Skicka privat meddelande misslyckades"
 
-#: ../src/groupchat_window.py:156
-#, fuzzy
-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."
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
+#, 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_window.py:160
-#, fuzzy
-msgid "Do _not ask me again"
-msgstr "Fråga mig inte igen"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "Gruppchatt"
 
-#: ../src/groupchat_window.py:298 ../src/groupchat_window.py:527
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "Det här rummet har inget ämne"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:449
+#: ../src/groupchat_control.py:604
 #, fuzzy, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%s blev sparkad av %s: %s"
 
-#: ../src/groupchat_window.py:453
+#: ../src/groupchat_control.py:608
 #, fuzzy, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%s blev sparkad av %s: %s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_window.py:460
+#: ../src/groupchat_control.py:615
 #, fuzzy, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%s har blivit bannlyst av %s: %s"
 
-#: ../src/groupchat_window.py:464
+#: ../src/groupchat_control.py:619
 #, fuzzy, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%s har blivit bannlyst av %s: %s"
 
-#: ../src/groupchat_window.py:472
+#: ../src/groupchat_control.py:627
 #, fuzzy, python-format
 msgid "You are now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../src/groupchat_window.py:474
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../src/groupchat_window.py:509
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_window.py:511
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../src/groupchat_window.py:548
-msgid "Changing Subject"
-msgstr "Ändrar ämne"
-
-#: ../src/groupchat_window.py:549
-msgid "Please specify the new subject:"
-msgstr "Ange det nya ämnet:"
-
-#: ../src/groupchat_window.py:558
-msgid "Changing Nickname"
-msgstr "Byt smeknamn"
-
-#: ../src/groupchat_window.py:559
-msgid "Please specify the new nickname you want to use:"
-msgstr "Ange det nya smeknamnet du vill använda:"
-
-#: ../src/groupchat_window.py:589
-msgid "Bookmark already set"
-msgstr "Bokmärke finns redan"
-
-#: ../src/groupchat_window.py:590
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "Rummet \"%s\" finns redan i dina bokmärken."
-
-#: ../src/groupchat_window.py:600
-msgid "Bookmark has been added successfully"
-msgstr "Bokmärke har blivit ordentligt tillagt"
-
-#: ../src/groupchat_window.py:601
-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."
-
-#. we are not connected
-#: ../src/groupchat_window.py:732 ../src/tabbed_chat_window.py:657
-msgid "A connection is not available"
-msgstr "En förbindelse är inte tillgänglig"
-
-#: ../src/groupchat_window.py:733 ../src/tabbed_chat_window.py:658
-msgid "Your message can not be sent until you are connected."
-msgstr "Ditt meddelande kan inte skickas förren du är ansluten."
-
-#: ../src/groupchat_window.py:804 ../src/groupchat_window.py:821
-#: ../src/groupchat_window.py:910 ../src/groupchat_window.py:926
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:846
+#: ../src/groupchat_control.py:813
 #, 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_window.py:853 ../src/groupchat_window.py:882
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr ""
 
-#: ../src/groupchat_window.py:946
+#: ../src/groupchat_control.py:917
 #, python-format
 msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr ""
 
-#: ../src/groupchat_window.py:957
+#: ../src/groupchat_control.py:939
 #, fuzzy, python-format
 msgid "Commands: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/groupchat_window.py:959
+#: ../src/groupchat_control.py:941
 #, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
@@ -1500,44 +1611,44 @@ msgid ""
 "spaces in nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:947
 #, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr ""
 
-#: ../src/groupchat_window.py:968
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr ""
 
-#: ../src/groupchat_window.py:971
+#: ../src/groupchat_control.py:952
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
 "specified."
 msgstr ""
 
-#: ../src/groupchat_window.py:974
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr ""
 
-#: ../src/groupchat_window.py:977
+#: ../src/groupchat_control.py:958
 #, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current room, optionally "
 "providing a reason."
 msgstr ""
 
-#: ../src/groupchat_window.py:980
+#: ../src/groupchat_control.py:961
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
 "using specified nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:983
+#: ../src/groupchat_control.py:965
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
@@ -1545,53 +1656,102 @@ msgid ""
 "nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:987
+#: ../src/groupchat_control.py:970
 #, python-format
 msgid ""
 "Usage: /%s <action>, sends action to the current room. Use third person. (e."
 "g. /%s explodes.)"
 msgstr ""
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:974
 #, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
 "message to the occupant specified by nickname."
 msgstr ""
 
-#: ../src/groupchat_window.py:994
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr ""
 
-#: ../src/groupchat_window.py:997
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr ""
 
-#: ../src/groupchat_window.py:1000
+#: ../src/groupchat_control.py:984
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
 msgstr ""
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr ""
 
+#: ../src/groupchat_control.py:1022
+#, fuzzy, python-format
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
+
+#: ../src/groupchat_control.py:1023
+#, fuzzy
+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:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "Fråga mig inte igen"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "Ändrar ämne"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "Ange det nya ämnet:"
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "Byt smeknamn"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "Ange det nya smeknamnet du vill använda:"
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "Bokmärke finns redan"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "Rummet \"%s\" finns redan i dina bokmärken."
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "Bokmärke har blivit ordentligt tillagt"
+
+#: ../src/groupchat_control.py:1101
+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_window.py:1087
+#: ../src/groupchat_control.py:1210
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_window.py:1088 ../src/groupchat_window.py:1119
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:1118
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -1748,42 +1908,38 @@ msgid "Accounts"
 msgstr "Konton"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Aktivera/Deaktivera notifiering för färdiga filöverföringar"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "A_vancerade åtgärder"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "Lägg till ny kontakt"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "Lägg till _kontakt"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "Adress"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "Avancerad"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "Avancerad konfigurationsredigerare"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "Efter smeknamn:"
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "Efter tid:"
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1793,63 +1949,63 @@ msgstr ""
 "Författande enbart\n"
 "Frånslagen"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "Tillåt _OS-information att skickas"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr ""
 "Tillåt popup/notifieringar när jag är bort_a/inte tillgänglig/upptagen/"
 "osynlig"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "Också känt som iChat-stil"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
 msgid ""
 "Animated\n"
 "Static"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "Fråga efter statusmeddelande när jag:"
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "Fråga:"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "Tilldela Open_PGP-nyckel"
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:58
 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:60
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "Automatiskt borta efter:"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "Automatiskt ej tillgänglig efter:"
 
-#: ../src/gtkgui.glade.h:62
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "Anslut automatiskt"
 
-#: ../src/gtkgui.glade.h:63
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1861,74 +2017,74 @@ msgstr ""
 "Använd alltid KDEs standardprogram\n"
 "Anpassa"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "Auktorisera kontakt automatiskt"
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:67
 #, fuzzy
 msgid "Autoreconnect when connection is lost"
 msgstr "Om du tar bort det kommer anslutningen förloras."
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "Före smeknamn:"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "Före tid:"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "Födelsedag:"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "Fetstil"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Anslut vid start av Gajim"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "Avbryt filöverföring"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "Avbryter the valda filöverföringen"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:76
 #, fuzzy
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "Avbryter the valda filöverföringen"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:77
 #, fuzzy
 msgid "Chan_ge Password"
 msgstr "Byt lösenord"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: ../src/gtkgui.glade.h:80
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "Byt smek_namn"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "Byt ämne"
 
-#: ../src/gtkgui.glade.h:83
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "Chattstatus notifieringar:"
 
-#: ../src/gtkgui.glade.h:84
+#: ../src/gtkgui.glade.h:83
 msgid ""
 "Check this option, only if someone you don't have in the roster spams/annoys "
 "you. Use with caution, cause it blocks all messages from any contact that is "
@@ -1938,7 +2094,7 @@ msgstr ""
 "irriterar dig. Använd med förstånd, för det blockerar alla meddelanden från "
 "alla kontakter som inte finns i registret"
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:84
 msgid ""
 "Check this so Gajim will connect in port 5223 where legacy servers are "
 "expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
@@ -1950,216 +2106,216 @@ msgstr ""
 "som standard om serverns stödjer det och med det här valet kommer TLS bli "
 "avslaget"
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "Välj nyc_kel..."
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "Ort:"
 
-#: ../src/gtkgui.glade.h:88
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "Städa _upp"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "Klicka för att byta kontots lösenord"
 
-#: ../src/gtkgui.glade.h:90
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr ""
 "Klicka för att visa funktioner (som MSN, ICQ transporter) på jabberservrar"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "Klicka för att visa tidigare konversationer i det här rummet"
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "Klicka för att via tidigare konversationer med den här kontakten"
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "Klient:"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "Företag:"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "Konfigurera _rum"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "Förbindelse"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "Kontaktinformation"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "Kontakt_info"
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "Konversationshistorik"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "Land:"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "Standard statusikonssett:"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "Radera MOTD"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "Radera dagens meddelande"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "Raderar dagens meddelande"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:106
 #, fuzzy
 msgid "Deny"
 msgstr "_Neka"
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:107
 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:109
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "Avdelning:"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:109
 #, fuzzy
 msgid "Display avatars of contacts in roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i registret"
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-post:"
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "Redigera grupper"
 
-#: ../src/gtkgui.glade.h:114
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "Redigera personlig information..."
 
-#: ../src/gtkgui.glade.h:115
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:115
 #, fuzzy
 msgid "Emoticon set:"
 msgstr "Hantera känsloikoner"
 
 #. XML Console enable checkbutton
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "Aktivera"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "Skriv in det igen för att bekräfta:"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "Skriv nytt lösenord:"
 
-#: ../src/gtkgui.glade.h:121
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "Händelser"
 
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "Var 5e _minut"
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "Extra adress:"
 
 #. Family Name
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "Efternamn:"
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "Fil_överföringar"
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "Filhanterare:"
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:129
 #, fuzzy
 msgid "Font style:"
 msgstr "Teckensnitt:"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "Teckensnitt:"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "Format: Ã…Ã…Ã…Ã…-MM-DD"
 
-#: ../src/gtkgui.glade.h:134
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "Från:"
 
-#: ../src/gtkgui.glade.h:136
+#: ../src/gtkgui.glade.h:135
 #, fuzzy
 msgid "G_o"
 msgstr "Kör"
 
-#: ../src/gtkgui.glade.h:138
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim temaanpassare"
 
-#: ../src/gtkgui.glade.h:139
+#: ../src/gtkgui.glade.h:138
 #, fuzzy
 msgid ""
 "Gajim can send and receive meta-information related to a conversation you "
@@ -2169,7 +2325,7 @@ msgstr ""
 "information relaterad till en konversation som du kan ha med en kontakt, som "
 "att författa ett meddelande"
 
-#: ../src/gtkgui.glade.h:140
+#: ../src/gtkgui.glade.h:139
 msgid ""
 "Gajim will automatically show the new received message in a new chat window "
 "or tab in an existing chat window"
@@ -2177,7 +2333,7 @@ msgstr ""
 "Gajim kommer automatiskt visa nya inkommande meddelanden i ett nytt "
 "chattfönster eller en flik i ett existerande chattfönster"
 
-#: ../src/gtkgui.glade.h:141
+#: ../src/gtkgui.glade.h:140
 msgid ""
 "Gajim will notify you for new message via a popup in the bottom right of the "
 "screen"
@@ -2185,7 +2341,7 @@ msgstr ""
 "Gajim kommer säga till dig om nya meddelanden med en popup i det nedre högra "
 "hörnet av skärmen"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:141
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed in"
@@ -2193,7 +2349,7 @@ msgstr ""
 "Gajim kommer säga till dig via ett popupfönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat in"
 
-#: ../src/gtkgui.glade.h:143
+#: ../src/gtkgui.glade.h:142
 msgid ""
 "Gajim will notify you via a popup window in the bottom right of the screen "
 "about contacts that just signed out"
@@ -2201,86 +2357,86 @@ msgstr ""
 "Gajim kommer säga till dig via ett popupfönster i det nedre högra hörnet av "
 "skärmen om kontakter som just loggat ut"
 
-#: ../src/gtkgui.glade.h:144
+#: ../src/gtkgui.glade.h:143
 msgid ""
 "Gajim will only change the icon of the contact that sent the new message"
 msgstr ""
 "Gajim kommer ändra ikonen på kontakten som skickade det nya meddelandet"
 
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:144
 #, fuzzy
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Första-gången guide"
 
-#: ../src/gtkgui.glade.h:146 ../src/roster_window.py:175
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
 msgid "General"
 msgstr "Generellt"
 
 #. Given Name
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "Förnamn:"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "Grupp:"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP anslut"
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "Gömmer fönstret"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "Hemsida:"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "Värdnamn: "
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "Jag har redan ett konto jag vill använda"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../src/gtkgui.glade.h:158
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "Jag vill lägga till dig i min kontaktlista."
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "Om ikryssat kommer Gajim också att ha en systembrickeikon"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:158
 #, fuzzy
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr "_Ignorera händelser från kontakter som inte finns i registret"
 
-#: ../src/gtkgui.glade.h:161
+#: ../src/gtkgui.glade.h:159
 msgid ""
 "If checked, Gajim will display status messages of contacts under the contact "
 "name in roster window"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:162
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "Om ikryssat kommer Gajim ansluta till den här gruppchatten vid start"
 
-#: ../src/gtkgui.glade.h:163
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Om ikryssat kommer Gajim komma ihåg lösenordet för det här kontot"
 
-#: ../src/gtkgui.glade.h:164
+#: ../src/gtkgui.glade.h:162
 msgid ""
 "If checked, Gajim will remember the roster and chat window positions in the "
 "screen and the sizes of them next time you run it"
@@ -2288,7 +2444,7 @@ msgstr ""
 "Om ikryssat kommer Gajim komma ihåg registrets och chatfönstrets positioner "
 "och storlekar på skärmen nästa gång du kör det"
 
-#: ../src/gtkgui.glade.h:165
+#: ../src/gtkgui.glade.h:163
 msgid ""
 "If checked, Gajim will replace ascii smilies like ':)' with equivalent "
 "graphical emoticons"
@@ -2296,7 +2452,7 @@ msgstr ""
 "Om ikryssat kommer Gajim ersätta ascii smilies som ':)' med liknande "
 "grafiska känsloikoner"
 
-#: ../src/gtkgui.glade.h:166
+#: ../src/gtkgui.glade.h:164
 msgid ""
 "If checked, Gajim will send keep-alive packets so it prevents connection "
 "timeout which results in disconnection"
@@ -2304,7 +2460,7 @@ msgstr ""
 "Om ikryssat kommer Gajim skicka håll-vid-liv paket som förhindrar att "
 "anslutningen gör timeout vilket leder till frånkoppling"
 
-#: ../src/gtkgui.glade.h:167
+#: ../src/gtkgui.glade.h:165
 #, fuzzy
 msgid ""
 "If checked, Gajim will store the password in ~/.gajim/config with 'read' "
@@ -2313,7 +2469,7 @@ msgstr ""
 "Om ikryssat kommer Gajim spara lösenordet i ~/.gajim/config med \"läs\"-"
 "rättigheter enbart för dig och såklart din administratör"
 
-#: ../src/gtkgui.glade.h:168
+#: ../src/gtkgui.glade.h:166
 msgid ""
 "If checked, Gajim will use protocol-specific status icons. (eg. A contact "
 "from MSN will have the equivalent msn icon for status online, away, busy, "
@@ -2323,7 +2479,7 @@ msgstr ""
 "kontakt för MSN kommer ha msns ikon för status online, borta, upptagen, "
 "osv...)"
 
-#: ../src/gtkgui.glade.h:169
+#: ../src/gtkgui.glade.h:167
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -2331,14 +2487,14 @@ msgstr ""
 "Om ikryssat kommer Gajim, när det startar, att automatiskt ansluta till "
 "jabber genom det här kontot"
 
-#: ../src/gtkgui.glade.h:170
+#: ../src/gtkgui.glade.h:168
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
 "accordingly"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:169
 msgid ""
 "If you have 2 or more accounts and it is checked, Gajim will list all "
 "contacts as if you had one account"
@@ -2346,169 +2502,182 @@ msgstr ""
 "Om du har 2 eller fler konton och det här är ikryssat kommer Gajim lista "
 "alla kontakter som om du hade ett konto"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "Inkommande meddelande:"
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "Info/Förfrågan (Info/Query)"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:173
 #, fuzzy
 msgid "Information about you, as stored in the server"
 msgstr "Information om dig är sparad på servern som vCard"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:177
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "Anslut till _gruppchatt"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "Plats"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "Hantera konton"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "Hantera bokmärken"
 
-#: ../src/gtkgui.glade.h:185
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "Hantera känsloikoner"
 
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "Hantera..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "Mellannamn:"
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "Mo_derator"
 
-#: ../src/gtkgui.glade.h:191
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "Mer"
 
-#: ../src/gtkgui.glade.h:192
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "Smeknamn:"
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "Ingen"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "Notifiera mig om kontakter som: "
 
-#: ../src/gtkgui.glade.h:198
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "OS:"
 
-#: ../src/gtkgui.glade.h:199
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "Vid varje _meddelande"
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "Skicka meddelande och stäng fönster"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "Öppna..."
 
-#: ../src/gtkgui.glade.h:201 ../src/tabbed_chat_window.py:232
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP kryptering"
-
-#: ../src/gtkgui.glade.h:202
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "Eller välj ett förinställt meddelande:"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "Utgående meddelande:"
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:211
 #, fuzzy
 msgid "Personal Information"
 msgstr "Redigera personlig information..."
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "Telefonnr.:"
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "_Spela ljud"
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "Port: "
 
-#: ../src/gtkgui.glade.h:211
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "Position:"
 
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "Postnummer:"
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "Inställningar"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:215
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "Prefix:"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "Skriv ut tid:"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:222
 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 "
@@ -2518,65 +2687,61 @@ 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:219
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "Profil, avatar"
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "Proxy:"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "Nyligen:"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "Registrera till"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:229
 #, fuzzy
 msgid "Remove account _only from Gajim"
 msgstr "Ta bort konto enbart från Gajim"
 
-#: ../src/gtkgui.glade.h:226
+#: ../src/gtkgui.glade.h:230
 #, fuzzy
 msgid "Remove account from Gajim and from _server"
 msgstr "Ta bort konto från Gajim och från server"
 
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "Ta bort filöverföring från listan."
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:232
 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:229
-msgid "Removing selected file transfer"
-msgstr "Tar bort vald filöverföring"
-
-#: ../src/gtkgui.glade.h:230
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "Svara på detta meddelande"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "Återställ till standardfärgerna"
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "Resur_s: "
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:236
 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 "
@@ -2590,224 +2755,220 @@ msgstr ""
 "och \"Jobb\" samtidigt. Resursen med högst prioritet kommer få händelserna. "
 "(se undertill)"
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "Resurs:"
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "Roll:"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "Rumkonfiguration"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "Spara _lösenfras (osäkert)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:242
 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:240
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:245
 #, fuzzy
 msgid "Search"
 msgstr "Tjänst"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "Skick_a"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "Skicka enstaka _meddelande"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "Skicka _fil"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:250
 #, fuzzy
 msgid "Send _New Message..."
 msgstr "_Nytt meddelande..."
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "Skicka håll-vid-liv paket"
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "Skicka meddelande"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:254
 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:252
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "Serverns funktioner"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "Ställ in MOTD"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "Ställ in dagens meddelande"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "Ställ in _avatar"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "Ställer in dagens meddelande"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "Visa _frånkopplade kontakter"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:264
 #, fuzzy
 msgid "Show _Roster"
 msgstr "Visa enbart i _registret"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:265
 #, fuzzy
 msgid "Show _XML Console"
 msgstr "_XML konsoll"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "Visa enbart i _registret"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:267
 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:265
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "Loggar _in"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "Loggar _ut"
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:271
 #, fuzzy
 msgid "Sta_tus"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "Starta _chatt"
 
-#: ../src/gtkgui.glade.h:270
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "Delstat:"
 
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "Status"
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "Statusmeddelande:"
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/gtkgui.glade.h:274
-msgid "Stoping selected file transfer"
-msgstr "Stoppar vald filöverföring"
-
-#: ../src/gtkgui.glade.h:275
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "Gatuadress:"
 
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "Ämne:"
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "Prenumerationsförfrågan"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "Prenumeration:"
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "Suffix:"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:284
 #, fuzzy
 msgid "Text _color:"
 msgstr "Textfärg"
 
-#: ../src/gtkgui.glade.h:283
+#: ../src/gtkgui.glade.h:285
 #, fuzzy
 msgid "Text _font:"
 msgstr "Textteckensnitt"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "Det automatiska borta statusmeddelandet"
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "Det automatiska inte tillgänglig statusmeddelandet"
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "Tema:"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:289
 msgid ""
 "This action removes single file transfer from the list. If the transfer is "
 "active, it is first stopped and then removed"
@@ -2815,80 +2976,76 @@ msgstr ""
 "Den här handlingen tar bort en enstaka filöverföring från listan. Om "
 "överföringen är aktiv, stoppas den först och tas sen bort"
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "Till:"
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "Slå på/av Open_PGP kryptering"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:293
 #, fuzzy
 msgid "Type your new status message:"
 msgstr "Det automatiska borta statusmeddelandet"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "Typ:"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "Understrykning"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "Uppdatera MOTD"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "Uppdatera dagens meddelande"
 
-#: ../src/gtkgui.glade.h:297
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "Uppdaterar dagens meddelande"
 
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "Använd _SSL (föråldrat)"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "Använd _känsloikoner"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "Använd _transporternas ikonuppsättningar"
 
-#: ../src/gtkgui.glade.h:301
-msgid "Use a single chat window with _tabs"
-msgstr "Använd ett enkelt chattfönster med _flikar"
-
-#: ../src/gtkgui.glade.h:302
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "Använd autentisering"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "Använd anpassat värdnamn/port"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "Användar-ID:"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:306
 msgid "When a file transfer is complete show a popup notification"
 msgstr "När en filöverföring är färdig, visa en popupnotifiering"
 
-#: ../src/gtkgui.glade.h:306
+#: ../src/gtkgui.glade.h:307
 msgid ""
 "When a new event (message, file transfer request etc..) is received, the "
 "following methods may be used to inform you about it. NOTE: New message "
@@ -2896,16 +3053,16 @@ msgid ""
 "chatting with"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:308
 #, fuzzy
 msgid "When new event is received"
 msgstr "När ett nytt meddelande är mottaget"
 
-#: ../src/gtkgui.glade.h:308
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "Jobb"
 
-#: ../src/gtkgui.glade.h:309
+#: ../src/gtkgui.glade.h:310
 #, fuzzy
 msgid ""
 "You need to have an account in order to connect\n"
@@ -2914,353 +3071,353 @@ msgstr ""
 "Du behöver ha ett konto för att kunna ansluta till\n"
 "Jabber-nätverket."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "Ditt JID:"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:313
+#. 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:314
 msgid "_Actions"
 msgstr "_Åtgärder"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "_Lägg till kontakt..."
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "_Lägg till registret"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "_Adress:"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "_Admin"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "_Administratör"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "_Auktorisera"
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:322
 #, fuzzy
 msgid "_Background:"
 msgstr "Bakgrundsfärg"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "_Bokmärk det här rummet"
 
-#: ../src/gtkgui.glade.h:324
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "_Webbläsare:"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "_Avbryt"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "_Kompakt vy Alt+C"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:328
 #, fuzzy
 msgid "_Contents"
 msgstr "_Fortsätt"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "_Kopiera JID/e-postadress"
 
-#: ../src/gtkgui.glade.h:330
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "_Kopiera länkadress"
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 #, fuzzy
 msgid "_Filter:"
 msgstr "Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Slutför"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Group Chat"
 msgstr "Gruppchatt"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "_Historik"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 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:344
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "_Ikon i systemlåda (aka. notifieringsyta)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 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:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:350
 #, fuzzy
 msgid "_Join New Room..."
 msgstr "Nytt rum"
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Sparka ut"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:352
 #, fuzzy
 msgid "_Log conversation history"
 msgstr "Konversationshistorik"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "_E-postklient:"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "Sa_mmanfoga konton"
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "_Meddelande"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "_Modifiera"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:359
 #, fuzzy
 msgid "_Modify Account..."
 msgstr "_Redigera konton..."
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "_Namn: "
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "_Notifiera mig om det"
 
-#: ../src/gtkgui.glade.h:362
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "_Notifiera mig när en filöverföring är färdig"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "_OK"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "_Innehavarhandlingar"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "_Anslutna användare"
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "_Öppna e-postförfattning"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "_Ägare"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "_Paus"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "_Spelare:"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "_Poppa upp det"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "_Inställningar"
 
-#: ../src/gtkgui.glade.h:376
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "_Närvaro"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "_Publicera"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "_Avsluta"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "Ta _bort"
 
-#: ../src/gtkgui.glade.h:380 ../src/roster_window.py:1093
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "Ta bo_rt från register"
 
-#: ../src/gtkgui.glade.h:381
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "Byt _namn"
 
-#: ../src/gtkgui.glade.h:382
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "_Svara"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "_Hämta"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr ""
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:386
+#. 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:387
 msgid "_Send"
 msgstr "_Skicka"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "_Skicka & stäng"
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "_Skicka server meddelande"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "_Skicka enstaka meddelande"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "_Ange bild..."
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "_Starta chatt"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "_Status"
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "_Använd proxy"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: ../src/gtkgui.glade.h:399
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "_Röst"
 
-#: ../src/gtkgui.glade.h:400
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "_XML konsoll..."
 
-#: ../src/gtkgui.glade.h:401
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "filöverföringslista"
 
-#: ../src/gtkgui.glade.h:402
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "minuter"
 
@@ -3270,17 +3427,17 @@ msgstr "minuter"
 msgid "Error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr ""
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 msgid "Error parsing file:"
 msgstr ""
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:300
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
@@ -3320,95 +3477,105 @@ msgstr "Statusen är nu: %s: %s"
 msgid "Status is now: %(status)s"
 msgstr "Statusen är nu: %s: %s"
 
-#: ../src/notify.py:146
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "Växla till %s"
+
+#: ../src/notify.py:145
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 msgstr ""
 
 #. we talk about a name here
-#: ../src/notify.py:151
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr ""
 
 #. we talk about a name here
-#: ../src/notify.py:160
+#: ../src/notify.py:159
 #, fuzzy, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/notify.py:174
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr ""
 
 #. ft stopped
-#: ../src/notify.py:178
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr ""
 
-#: ../src/notify.py:191
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr ""
 
 #. ft stopped
-#: ../src/notify.py:195
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr ""
 
-#: ../src/roster_window.py:123
+#: ../src/roster_window.py:128
 #, fuzzy
 msgid "Merged accounts"
 msgstr "Sa_mmanfoga konton"
 
-#: ../src/roster_window.py:328
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "Server"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du är redan i rummet %s"
 
-#: ../src/roster_window.py:333 ../src/roster_window.py:1804
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 #, fuzzy
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: ../src/roster_window.py:486
+#: ../src/roster_window.py:498
 #, fuzzy
 msgid "_Join New Room"
 msgstr "Nytt rum"
 
-#: ../src/roster_window.py:501
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "Hantera bokmärken..."
 
-#: ../src/roster_window.py:516
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
-#: ../src/roster_window.py:528
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "använder %s konto"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:554
 #, fuzzy, python-format
 msgid "using account %s"
 msgstr "använder %s konto"
 
-#: ../src/roster_window.py:553
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "för konto %s"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:844
+#: ../src/roster_window.py:859
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -3417,70 +3584,70 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från %s"
 
-#: ../src/roster_window.py:896
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:897
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:1012
+#: ../src/roster_window.py:1027
 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:1045
+#: ../src/roster_window.py:1060
 #, fuzzy
 msgid "Re_name"
 msgstr "Döp om"
 
-#: ../src/roster_window.py:1066
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "_Logga på"
 
-#: ../src/roster_window.py:1075
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "L_ogga av"
 
-#: ../src/roster_window.py:1169
+#: ../src/roster_window.py:1184
 #, fuzzy
 msgid "_Change Status Message"
 msgstr "%s Statusmeddelande"
 
-#: ../src/roster_window.py:1240
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1241
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1264
+#: ../src/roster_window.py:1279
 #, fuzzy, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Om \"%s\" accepterar din förfrågan kommer du veta hans status."
 
-#: ../src/roster_window.py:1274
+#: ../src/roster_window.py:1290
 #, fuzzy
 msgid "Authorization has been removed"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1275
+#: ../src/roster_window.py:1291
 #, fuzzy, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Du kommer alltid se honom som offline."
 
-#: ../src/roster_window.py:1420
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:1421
+#: ../src/roster_window.py:1440
 #, fuzzy
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
@@ -3489,46 +3656,46 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten \"%s\" kommer alltid se dig som nerkopplad."
 
-#: ../src/roster_window.py:1422
+#: ../src/roster_window.py:1441
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1504
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/roster_window.py:1505
+#: ../src/roster_window.py:1523
 #, 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:1506
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "Spara lösenfras"
 
-#: ../src/roster_window.py:1549 ../src/roster_window.py:1609
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1550 ../src/roster_window.py:1610
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
 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:1569
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:1570
+#: ../src/roster_window.py:1588
 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:1963 ../src/roster_window.py:1969
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:1964 ../src/roster_window.py:1970
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3536,188 +3703,141 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:2663
+#: ../src/roster_window.py:2704
 #, fuzzy
 msgid "Change Status Message..."
 msgstr "%s Statusmeddelande"
 
-#: ../src/systray.py:150
+#: ../src/systray.py:151
 #, fuzzy
 msgid "_Change Status Message..."
 msgstr "%s Statusmeddelande"
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:182 ../src/systray.py:187
+#: ../src/systray.py:183 ../src/systray.py:188
 #, fuzzy
 msgid "using account "
 msgstr "använder %s konto"
 
-#: ../src/systray.py:208
+#: ../src/systray.py:209
 #, fuzzy
 msgid "Hide this menu"
 msgstr "Gömmer fönstret"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 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:267
+#: ../src/tooltips.py:266
 #, fuzzy, 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"
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:236
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr ""
-"%s har inte skrikit ut en OpenPGP-nyckel, inte heller har du tilldelat en"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:401 ../src/tabbed_chat_window.py:457
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "Du mottog just ett meddelande från \"%s\""
-
-#: ../src/tabbed_chat_window.py:402
-msgid ""
-"If you close this tab and you have history disabled, this message will be "
-"lost."
-msgstr ""
-"Om du stänger den här tabben och du har historik avslaget kommer meddelandet "
-"att förloras."
-
-#: ../src/tabbed_chat_window.py:458
-msgid ""
-"If you close this tab and you have history disabled, the message will be "
-"lost."
-msgstr ""
-"Om du stänger den här tabben och du har historik avstängt kommer meddelandet "
-"försvinna."
-
-#: ../src/tabbed_chat_window.py:750
-msgid "Sending private message failed"
-msgstr "Skicka privat meddelande misslyckades"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:752
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "Du är inte längre i rummet \"%s\" eller \"%s\" har lämnat."
-
-#: ../src/tabbed_chat_window.py:894
-msgid "Encryption enabled"
-msgstr "Kryptering påslaget"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption disabled"
-msgstr "Kryptering avslagen"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, fuzzy, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - ett oläst meddelande"
 msgstr[1] "Gajim - %d olästa meddelanden"
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, fuzzy, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - ett oläst meddelande"
 msgstr[1] "Gajim - %d olästa meddelanden"
 
-#: ../src/tooltips.py:285
+#: ../src/tooltips.py:284
 #, fuzzy, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - ett oläst meddelande"
 msgstr[1] "Gajim - %d olästa meddelanden"
 
-#: ../src/tooltips.py:300 ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "Roll: "
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "Anslutning: "
 
-#: ../src/tooltips.py:336 ../src/tooltips.py:431 ../src/tooltips.py:445
-#: ../src/tooltips.py:509
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
+#: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:346 ../src/tooltips.py:441
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:411
+#: ../src/tooltips.py:410
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:421
+#: ../src/tooltips.py:420
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:480
+#: ../src/tooltips.py:479
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:482
+#: ../src/tooltips.py:481
 msgid "Download"
 msgstr "Nerladdning"
 
-#: ../src/tooltips.py:484
+#: ../src/tooltips.py:483
 msgid "Upload"
 msgstr "Uppladdning"
 
-#: ../src/tooltips.py:502
+#: ../src/tooltips.py:501
 msgid "Size: "
 msgstr "Storlek: "
 
-#: ../src/tooltips.py:504
+#: ../src/tooltips.py:503
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:512 ../src/tooltips.py:533
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:516
+#: ../src/tooltips.py:515
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:518 ../src/tooltips.py:521
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "Färdig"
 
-#: ../src/tooltips.py:525
+#: ../src/tooltips.py:524
 msgid "Paused"
 msgstr "Pausad"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:529
+#: ../src/tooltips.py:528
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:531
+#: ../src/tooltips.py:530
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:550
+#: ../src/tooltips.py:549
 msgid "This service has not yet responded with detailed information"
 msgstr ""
 
-#: ../src/tooltips.py:552
+#: ../src/tooltips.py:551
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -3729,64 +3849,64 @@ msgstr "Välj avatar"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "Filstorleken för bilden \"%s\" är för stor"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 #, fuzzy
 msgid "The file must not be more than 32 kilobytes."
 msgstr "Filen får inte vara mer än 8 kilobyte."
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:292
+#: ../src/vcard.py:289
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 
-#: ../src/vcard.py:294
+#: ../src/vcard.py:291
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:298
+#: ../src/vcard.py:295
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:319 ../src/vcard.py:339
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:419
 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:451
+#: ../src/vcard.py:448
 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:455
+#: ../src/vcard.py:452
 #, fuzzy
 msgid "Personal details"
 msgstr "Redigera personlig information..."
@@ -3796,25 +3916,26 @@ msgstr "Redigera personlig information..."
 msgid "creating logs database"
 msgstr "skapar katalogen %s"
 
-#: ../src/common/check_paths.py:79 ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s är en fil, men borde vara en katalog"
 
-#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu avslutas"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88 ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, fuzzy, python-format
 msgid "%s is directory but should be file"
 msgstr "%s är en fil, men borde vara en katalog"
@@ -3836,380 +3957,404 @@ msgstr "D-Bus finns inte på den här maskinen"
 msgid "Session bus is not available"
 msgstr "Sessionsbus inte tillgänglig"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr ""
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr ""
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "Borta på grund av inaktivitet"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr ""
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "Inte tillgänglig på grund av inaktivitet"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:92
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr ""
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:134
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
 msgstr ""
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 
-#: ../src/common/config.py:128
+#: ../src/common/config.py:136
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
 msgstr ""
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr ""
 
 #. which version created the config
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 #, fuzzy
 msgid "Use compact view when you open a chat window"
 msgstr "Banderollraden som är på toppen av chattfönster"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr ""
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, 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:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr ""
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr ""
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
+#: ../src/common/config.py:154
 msgid ""
 "Overrides the host we send for File Transfer in case of address translation/"
 "port forwarding."
 msgstr ""
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr ""
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 #, fuzzy
 msgid "Show tab when only one conversation?"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr ""
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr ""
 
-#: ../src/common/config.py:162
+#: ../src/common/config.py:173
 msgid ""
 "A semicolon-separated list of words that will be highlighted in multi-user "
 "chat."
 msgstr ""
 
-#: ../src/common/config.py:163
+#: ../src/common/config.py:174
 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:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr ""
 
-#: ../src/common/config.py:165
+#: ../src/common/config.py:176
 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:166
+#: ../src/common/config.py:177
 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:168
+#: ../src/common/config.py:179
 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: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
 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:175
+#: ../src/common/config.py:186
 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:177
+#: ../src/common/config.py:188
 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:334
+#: ../src/common/config.py:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, så lämna ett meddelande."
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:337
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:340
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:349
+#: ../src/common/config.py:367
 msgid ""
 "Sound to play when a MUC message contains one of the words in "
 "muc_highlight_words, or when a MUC message contains your nickname."
 msgstr ""
 
-#: ../src/common/config.py:350
+#: ../src/common/config.py:368
 msgid ""
 "Sound to play when any MUC message arrives. (This setting is taken into "
 "account only if notify_on_all_muc_messages is True)"
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:355 ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr ""
 
-#: ../src/common/config.py:359 ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr ""
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:381
 msgid "human"
 msgstr ""
 
-#: ../src/common/config.py:367
+#: ../src/common/config.py:385
 #, fuzzy
 msgid "marine"
 msgstr "minuter"
 
-#: ../src/common/config.py:371 ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr ""
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "Lyckades inte gå med i rummet"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454 ../src/common/connection.py:457
-#: ../src/common/connection.py:460 ../src/common/connection.py:463
-#: ../src/common/connection.py:466 ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "Lyckades inte gå med i rummet"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr ""
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 #, fuzzy
 msgid "You are banned from this room."
 msgstr "Du är redan i rummet %s"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr ""
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr ""
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr ""
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 #, fuzzy
 msgid "You are not in the members list."
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
 msgstr ""
 
-#: ../src/common/connection.py:504 ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 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:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection.py:550 ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:551 ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 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:1280
+#: ../src/common/connection.py:1382
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
 "management tools such as http://jru.jabberstudio.org/ to remove it"
 msgstr ""
 
-#: ../src/common/connection.py:1636 ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, fuzzy, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "Ansluten till server med %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din förbindelse eller försök igen"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Inloggning misslyckades med \"%s\""
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 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:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, 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:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "osynlig"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "nerkopplad"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "Jag är %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4218,17 +4363,17 @@ msgstr ""
 "Ämne: %s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr ""
 
-#: ../src/common/connection.py:2354
+#: ../src/common/connection.py:2520
 #, fuzzy
 msgid "Timeout"
 msgstr "Tema"
 
-#: ../src/common/connection.py:2395 ../src/common/connection.py:2407
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr ""
 
@@ -4360,10 +4505,6 @@ msgstr "Osynlig"
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "Inte i registret"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
@@ -4451,10 +4592,42 @@ 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:163 ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr ""
 
+#~ msgid "account: "
+#~ msgstr "konto: "
+
+#, fuzzy
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
+
+#, fuzzy
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr ""
+#~ "Om du stänger det här fönstret kommer du bli frånkopplad från det här "
+#~ "rummet."
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "Aktivera/Deaktivera notifiering för färdiga filöverföringar"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "Tar bort vald filöverföring"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "Stoppar vald filöverföring"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "Använd ett enkelt chattfönster med _flikar"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr ""
+#~ "Om du stänger den här tabben och du har historik avstängt kommer "
+#~ "meddelandet försvinna."
+
 #~ msgid "Cannot remove last group"
 #~ msgstr "Kan inte ta bort den sista gruppen"
 
@@ -4506,9 +4679,6 @@ msgstr ""
 #~ msgid "Chat with"
 #~ msgstr "Chatta med"
 
-#~ msgid "E-Mail"
-#~ msgstr "E-post"
-
 #, fuzzy
 #~ msgid "Send New Message"
 #~ msgstr "Nytt meddelande"
diff --git a/po/zh_CN/LC_MESSAGES/gajim.po b/po/zh_CN/LC_MESSAGES/gajim.po
index cb710bc7eda1dbbcde8dc3c45da99dcd9a8ef57d..397447f3ee9a2fccf64a8e6b5b878e2691fec229 100644
--- a/po/zh_CN/LC_MESSAGES/gajim.po
+++ b/po/zh_CN/LC_MESSAGES/gajim.po
@@ -5,11 +5,12 @@
 # wwld <wwld@radio.lzusiyu.org>, 2005.
 # kangkang <kanger@gamil.com>, 2005.
 #
+#: ../src/gajim-remote.py:196 ../src/gajim-remote.py:203
 msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-27 02:04+0200\n"
+"POT-Creation-Date: 2006-01-19 23:09+0100\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"
@@ -24,10 +25,8 @@ msgstr ""
 msgid "A GTK+ Jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
-#: ../gajim.desktop.in.h:2
-#: ../src/gtkgui.glade.h:134
-#: ../src/notify.py:192
-#: ../src/tooltips.py:291
+#: ../gajim.desktop.in.h:2 ../src/gtkgui.glade.h:136 ../src/notify.py:227
+#: ../src/notify.py:235 ../src/tooltips.py:290
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -57,377 +56,457 @@ msgstr "(æ— )"
 msgid "Hidden"
 msgstr "隐藏"
 
-#: ../src/chat.py:187
-#: ../src/gtkgui.glade.h:80
-msgid "Chat"
-msgstr "聊天"
+#. FIXME: add a ui for this use spell.set_language()
+#: ../src/chat_control.py:125 ../src/dialogs.py:1127
+msgid ""
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
+"\n"
+"Highlighting misspelled words feature will not be used"
+msgstr ""
+"如果拼写检查不匹配您所使用用的语言，请正确设定您的 $LANG 。例如，法语用户就"
+"在 ~/.bash_profile 中键入 LANG=fr_FR 或 LANG=fr_FR.UTF-8 ，或在 /etc/profile "
+"中进行全局设定。\n"
+"\n"
+"拼写检查功能未启用"
 
-#: ../src/chat.py:189
-#: ../src/gtkgui.glade.h:146
-msgid "Group Chat"
-msgstr "群聊"
+#. we are not connected
+#: ../src/chat_control.py:301
+msgid "A connection is not available"
+msgstr "连接不可用"
 
-#. if we have 2 or more accounts
-#: ../src/chat.py:203
-msgid "account: "
-msgstr "账户："
+#: ../src/chat_control.py:302
+msgid "Your message can not be sent until you are connected."
+msgstr "连接之后您的消息才能发送"
 
 #. Check if jid is already in roster
 #. Groups maynot change name from or to 'Not in Roster'
-#: ../src/chat.py:468
-#: ../src/conversation_textview.py:376
-#: ../src/dialogs.py:126
-#: ../src/dialogs.py:347
-#: ../src/dialogs.py:385
-#: ../src/dialogs.py:949
-#: ../src/dialogs.py:950
-#: ../src/gajim.py:559
-#: ../src/gajim.py:560
-#: ../src/roster_window.py:979
-#: ../src/roster_window.py:1250
-#: ../src/roster_window.py:1422
-#: ../src/roster_window.py:1671
-#: ../src/roster_window.py:1704
-#: ../src/roster_window.py:2124
-#: ../src/roster_window.py:2372
-#: ../src/roster_window.py:2374
-#: ../src/roster_window.py:2461
-#: ../src/roster_window.py:2469
+#: ../src/chat_control.py:626 ../src/conversation_textview.py:374
+#: ../src/dialogs.py:120 ../src/dialogs.py:341 ../src/dialogs.py:380
+#: ../src/dialogs.py:1061 ../src/gajim.py:539 ../src/gajim.py:540
+#: ../src/roster_window.py:1006 ../src/roster_window.py:1277
+#: ../src/roster_window.py:1453 ../src/roster_window.py:1711
+#: ../src/roster_window.py:1744 ../src/roster_window.py:2167
+#: ../src/roster_window.py:2406 ../src/roster_window.py:2408
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/common/helpers.py:228
 msgid "Not in Roster"
 msgstr "不在名单中"
 
-#: ../src/chat.py:556
+#: ../src/chat_control.py:672 ../src/gtkgui.glade.h:81
+msgid "Chat"
+msgstr "聊天"
+
+#: ../src/chat_control.py:862 ../src/gtkgui.glade.h:205
+msgid "OpenPGP Encryption"
+msgstr "OpenPGP 加密"
+
+#. we talk about a contact here
+#: ../src/chat_control.py:866
+#, fuzzy, python-format
+msgid "%s has not broadcast an OpenPGP key, nor has one been assigned"
+msgstr "%s 没有广播 OpenPGP 密钥或您未指定"
+
+#: ../src/chat_control.py:986
+msgid "Encryption enabled"
+msgstr "启用加密"
+
+#: ../src/chat_control.py:991
+msgid "Encryption disabled"
+msgstr "禁用加密"
+
+#. %s is being replaced in the code with JID
+#: ../src/chat_control.py:1188
 #, python-format
-msgid "Switch to %s"
-msgstr "切换到 %s"
+msgid "You just received a new message from \"%s\""
+msgstr "收到一条来自 “%s” 的消息"
 
-#. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:785
-#: ../src/dialogs.py:1023
+#: ../src/chat_control.py:1189
 msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
-"\n"
-"Highlighting misspelled words feature will not be used"
-msgstr ""
-"如果拼写检查不匹配您所使用用的语言，请正确设定您的 $LANG 。例如，法语用户就在 ~/.bash_profile 中键入 LANG=fr_FR 或 LANG=fr_FR.UTF-8 ，或在 /etc/profile 中进行全局设定。\n"
-"\n"
-"拼写检查功能未启用"
+"If you close this tab and you have history disabled, this message will be "
+"lost."
+msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
 
-#: ../src/config.py:185
-#: ../src/config.py:428
+#: ../src/config.py:192 ../src/config.py:435
 #, python-format
 msgid "Every %s _minutes"
 msgstr "每 %s 分钟(m)"
 
-#: ../src/config.py:306
+#: ../src/config.py:313
 msgid "Active"
 msgstr "活动"
 
-#: ../src/config.py:314
+#: ../src/config.py:321
 msgid "Event"
 msgstr "事件"
 
-#: ../src/config.py:320
+#: ../src/config.py:327
 msgid "Sound"
 msgstr "声音"
 
-#: ../src/config.py:922
+#: ../src/config.py:854
 msgid "status message title"
 msgstr "状态消息标题"
 
-#: ../src/config.py:922
+#: ../src/config.py:854
 msgid "status message text"
 msgstr "状态消息文本"
 
-#: ../src/config.py:973
+#: ../src/config.py:905
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/config.py:986
-#: ../src/config.py:2066
-#: ../src/vcard.py:181
+#: ../src/config.py:918 ../src/config.py:2166 ../src/vcard.py:181
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/config.py:991
+#: ../src/config.py:923
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/config.py:1152
+#: ../src/config.py:1084
 msgid "OpenPGP is not usable in this computer"
 msgstr "OpenPGP 在本机不可用"
 
-#: ../src/config.py:1176
+#: ../src/config.py:1108
 msgid "You are currently connected to the server"
 msgstr "正在连接到服务器"
 
-#: ../src/config.py:1177
+#: ../src/config.py:1109
 msgid "To change the account name, you must be disconnected."
 msgstr "如要改变账户名称，需断开连接。"
 
-#: ../src/config.py:1180
-#: ../src/config.py:1184
+#: ../src/config.py:1112 ../src/config.py:1116
 msgid "Invalid account name"
 msgstr "无效的账户名称"
 
-#: ../src/config.py:1181
+#: ../src/config.py:1113
 msgid "Account name cannot be empty."
 msgstr "账户名不能为空。"
 
-#: ../src/config.py:1185
+#: ../src/config.py:1117
 msgid "Account name cannot contain spaces."
 msgstr "账户名不能包含空格。"
 
-#: ../src/config.py:1193
-#: ../src/config.py:1199
-#: ../src/config.py:1208
-#: ../src/config.py:2581
+#: ../src/config.py:1125 ../src/config.py:1131 ../src/config.py:1140
+#: ../src/config.py:2668
 msgid "Invalid Jabber ID"
 msgstr "无效的 Jabber ID"
 
-#: ../src/config.py:1200
+#: ../src/config.py:1132
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID 的格式为 “用户@服务器名”。"
 
-#: ../src/config.py:1254
+#: ../src/config.py:1186
 msgid "Invalid entry"
 msgstr "无效输入"
 
-#: ../src/config.py:1255
+#: ../src/config.py:1187
 msgid "Custom port must be a port number."
 msgstr "自定义端口必须为端口号。"
 
-#: ../src/config.py:1356
+#: ../src/config.py:1286
 msgid "No such account available"
 msgstr "没有有效账户"
 
-#: ../src/config.py:1357
+#: ../src/config.py:1287
 msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
-#: ../src/config.py:1364
-#: ../src/dialogs.py:662
-#: ../src/dialogs.py:778
-#: ../src/disco.py:421
-#: ../src/vcard.py:420
-#: ../src/vcard.py:449
+#: ../src/config.py:1294 ../src/dialogs.py:687 ../src/dialogs.py:834
+#: ../src/disco.py:420 ../src/vcard.py:418 ../src/vcard.py:447
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
-#: ../src/config.py:1365
+#: ../src/config.py:1295
 msgid "Without a connection, you can not edit your personal information."
 msgstr "无法脱机编辑个人信息。"
 
-#: ../src/config.py:1396
+#: ../src/config.py:1326
 msgid "Failed to get secret keys"
 msgstr "获取密钥失败"
 
-#: ../src/config.py:1397
+#: ../src/config.py:1327
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "在取回 OpenPGP 密钥时发生错误。"
 
-#: ../src/config.py:1400
-#: ../src/gtkgui.glade.h:202
+#: ../src/config.py:1330 ../src/gtkgui.glade.h:209
 msgid "Passphrase"
 msgstr "密文"
 
-#: ../src/config.py:1401
+#: ../src/config.py:1331
 msgid "Choose your OpenPGP key"
 msgstr "选择您的 OpenPGP 钥匙"
 
-#: ../src/config.py:1409
-#: ../src/gtkgui.glade.h:191
+#: ../src/config.py:1339 ../src/gtkgui.glade.h:196
 msgid "No key selected"
 msgstr "没有选择钥匙"
 
 #. Name column
-#: ../src/config.py:1628
-#: ../src/disco.py:679
-#: ../src/disco.py:1416
-#: ../src/history_window.py:85
+#: ../src/config.py:1558 ../src/disco.py:678 ../src/disco.py:1419
+#: ../src/history_window.py:86
 msgid "Name"
 msgstr "名称"
 
-#: ../src/config.py:1631
+#: ../src/config.py:1561
 msgid "Server"
 msgstr "服务器"
 
-#. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1884
-#: ../src/dialogs.py:126
-#: ../src/dialogs.py:309
-#: ../src/dialogs.py:347
-#: ../src/disco.py:120
-#: ../src/disco.py:121
-#: ../src/disco.py:1199
-#: ../src/roster_window.py:152
-#: ../src/roster_window.py:170
-#: ../src/roster_window.py:194
-#: ../src/roster_window.py:2368
-#: ../src/roster_window.py:2370
-#: ../src/roster_window.py:2461
-#: ../src/roster_window.py:2469
-#: ../src/systray.py:244
-msgid "Transports"
-msgstr "代理"
-
-#: ../src/config.py:1923
+#: ../src/config.py:1803
 #, python-format
 msgid "Edit %s"
 msgstr "编辑 %s"
 
-#: ../src/config.py:1925
+#: ../src/config.py:1805
 #, python-format
 msgid "Register to %s"
 msgstr "注册到 %s"
 
-#: ../src/config.py:1944
+#: ../src/config.py:1876
+msgid "Ban List"
+msgstr ""
+
+#: ../src/config.py:1877
+#, fuzzy
+msgid "Member List"
+msgstr "成员(_M)"
+
+#: ../src/config.py:1878
+#, fuzzy
+msgid "Owner List"
+msgstr "拥有人(_O)"
+
+#: ../src/config.py:1879
+#, fuzzy
+msgid "Administrator List"
+msgstr "管理员(_A)"
+
+#. Address column
+#: ../src/config.py:1912 ../src/disco.py:685
+msgid "JID"
+msgstr "JID"
+
+#: ../src/config.py:1920
+msgid "Reason"
+msgstr ""
+
+#: ../src/config.py:1925
+#, fuzzy
+msgid "Nick"
+msgstr "踢除(_K)"
+
+#: ../src/config.py:1929
+#, fuzzy
+msgid "Role"
+msgstr "角色："
+
+#: ../src/config.py:1950
+#, fuzzy
+msgid "Banning..."
+msgstr "封禁 %s"
+
+#. You can move '\n' before user@domain if that line is TOO BIG
+#: ../src/config.py:1952
+#, fuzzy
+msgid ""
+"<b>Whom do you want to ban?</b>\n"
+"\n"
+msgstr "<b>想做什么？</b>"
+
+#: ../src/config.py:1954
+msgid "Adding Member..."
+msgstr ""
+
+#: ../src/config.py:1955
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a member?</b>\n"
+"\n"
+msgstr "<b>想做什么？</b>"
+
+#: ../src/config.py:1957
+msgid "Adding Owner..."
+msgstr ""
+
+#: ../src/config.py:1958
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make a owner?</b>\n"
+"\n"
+msgstr "<b>想做什么？</b>"
+
+#: ../src/config.py:1960
+#, fuzzy
+msgid "Adding Administrator..."
+msgstr "管理员(_A)"
+
+#: ../src/config.py:1961
+#, fuzzy
+msgid ""
+"<b>Whom do you want to make an administrator?</b>\n"
+"\n"
+msgstr "<b>想做什么？</b>"
+
+#: ../src/config.py:1962
+msgid ""
+"Can be one of the following:\n"
+"1. user@domain/resource (only that resource matches).\n"
+"2. user@domain (any resource matches).\n"
+"3. domain/resource (only that resource matches).\n"
+"4. domain (the domain itself matches, as does any user@domain,\n"
+"domain/resource, or address containing a subdomain."
+msgstr ""
+
+#: ../src/config.py:2049
 msgid "Text"
 msgstr "文本"
 
-#: ../src/config.py:1952
+#: ../src/config.py:2057
 msgid "Image"
 msgstr "形象"
 
-#: ../src/config.py:2054
+#: ../src/config.py:2154
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/config.py:2071
-#: ../src/vcard.py:186
+#: ../src/config.py:2171 ../src/vcard.py:186
 msgid "Images"
 msgstr "形象"
 
-#: ../src/config.py:2166
+#: ../src/config.py:2248
 #, python-format
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2173
+#: ../src/config.py:2255
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "账户 “%s” 已连接到服务器"
 
-#: ../src/config.py:2174
+#: ../src/config.py:2256
 msgid "If you remove it, the connection will be lost."
 msgstr "如果移除，将会丢失连接"
 
-#: ../src/config.py:2183
-#: ../src/roster_window.py:1451
+#: ../src/config.py:2265 ../src/roster_window.py:1483
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2184
-#: ../src/roster_window.py:1452
+#: ../src/config.py:2266 ../src/roster_window.py:1484
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2185
-#: ../src/roster_window.py:1453
+#: ../src/config.py:2267 ../src/roster_window.py:1485
 msgid "Save password"
 msgstr "保存密码"
 
-#: ../src/config.py:2315
+#: ../src/config.py:2401
 msgid "New Room"
 msgstr "新房间"
 
-#: ../src/config.py:2345
+#: ../src/config.py:2432
 msgid "This bookmark has invalid data"
 msgstr "此书签含无效数据"
 
-#: ../src/config.py:2346
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2433
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "请确认填写服务器与房间字段或移除此书签。"
 
-#: ../src/config.py:2563
+#: ../src/config.py:2650
 msgid "Invalid username"
 msgstr "无效用户名"
 
-#: ../src/config.py:2564
+#: ../src/config.py:2651
 msgid "You must provide a username to configure this account."
 msgstr "必须提供用户名来配置此账户。"
 
-#: ../src/config.py:2572
-#: ../src/dialogs.py:797
+#: ../src/config.py:2659 ../src/dialogs.py:853
 msgid "Invalid password"
 msgstr "无效密码"
 
-#: ../src/config.py:2573
+#: ../src/config.py:2660
 msgid "You must enter a password for the new account."
 msgstr "必须为新账户输入密码。"
 
-#: ../src/config.py:2598
+#: ../src/config.py:2685
 msgid "Account has been added successfully"
 msgstr "成功添加账户"
 
-#: ../src/config.py:2599
-#: ../src/config.py:2629
-msgid "You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window."
-msgstr "您可以通过点击高级按钮进行高级设置，或稍后点击主窗口中编辑菜单下的账户菜单项。"
+#: ../src/config.py:2686 ../src/config.py:2716
+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:2628
+#: ../src/config.py:2715
 msgid "Your new account has been created successfully"
 msgstr "注册新账户成功"
 
-#: ../src/config.py:2643
+#: ../src/config.py:2730
 msgid "An error occured during account creation"
 msgstr "创建帐户过程中发生错误"
 
-#: ../src/config.py:2720
+#: ../src/config.py:2807
 msgid "Account name is in use"
 msgstr "帐户名已经被使用"
 
-#: ../src/config.py:2721
+#: ../src/config.py:2808
 msgid "You already have an account using this name."
 msgstr "有同名账户。"
 
-#: ../src/conversation_textview.py:183
-msgid "Text below this line is what has been said since the last time you paid attention to this group chat"
+#: ../src/conversation_textview.py:181
+msgid ""
+"Text below this line is what has been said since the last time you paid "
+"attention to this group chat"
 msgstr "以下文字是您上次发言至今的群聊内容"
 
-#: ../src/conversation_textview.py:242
+#: ../src/conversation_textview.py:240
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "“%s”的动作"
 
-#: ../src/conversation_textview.py:254
+#: ../src/conversation_textview.py:252
 msgid "Read _Wikipedia Article"
 msgstr "读取 Wikipedia 文章(_W)"
 
-#: ../src/conversation_textview.py:258
+#: ../src/conversation_textview.py:256
 msgid "Look it up in _Dictionary"
 msgstr "从字典(_D)中搜索"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/conversation_textview.py:273
+#: ../src/conversation_textview.py:271
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "字典地址缺少 “%s” 并且它不是 WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:284
+#: ../src/conversation_textview.py:282
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "网站搜索地址缺少 “%s”"
 
-#: ../src/conversation_textview.py:287
+#: ../src/conversation_textview.py:285
 msgid "Web _Search for it"
 msgstr "用网页搜索(_S)"
 
-#: ../src/conversation_textview.py:563
+#: ../src/conversation_textview.py:571
 msgid "Yesterday"
 msgstr "昨天"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:567
+#: ../src/conversation_textview.py:575
 #, python-format
 msgid "%i days ago"
 msgstr "%i 天前"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:621
+#: ../src/conversation_textview.py:629
 #, python-format
 msgid "Subject: %s\n"
 msgstr "主题：%s\n"
@@ -441,116 +520,140 @@ msgstr "本机缺少 D-Bus python 绑定"
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajim 的 D-Bus 兼容性无法使用"
 
-#: ../src/dialogs.py:68
+#: ../src/dialogs.py:67
 #, python-format
 msgid "Contact's name: <i>%s</i>"
 msgstr "联系人名称：<i>%s</i>"
 
-#: ../src/dialogs.py:70
+#: ../src/dialogs.py:69
 #, python-format
 msgid "JID: <i>%s</i>"
 msgstr "JID： <i>%s</i>"
 
-#. we try to remove
-#. the last group
-#: ../src/dialogs.py:112
-msgid "Cannot remove last group"
-msgstr "无法移除上一个群"
-
-#: ../src/dialogs.py:113
-msgid "At least one contact group must be present."
-msgstr "至少保留一个联系群组"
+#. if not '@' or '@' starts the jid ==> agent
+#: ../src/dialogs.py:120 ../src/dialogs.py:303 ../src/dialogs.py:341
+#: ../src/disco.py:119 ../src/disco.py:120 ../src/disco.py:1202
+#: ../src/roster_window.py:158 ../src/roster_window.py:174
+#: ../src/roster_window.py:203 ../src/roster_window.py:218
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2404
+#: ../src/roster_window.py:2521 ../src/roster_window.py:2529
+#: ../src/systray.py:244
+msgid "Transports"
+msgstr "代理"
 
-#: ../src/dialogs.py:134
+#: ../src/dialogs.py:128
 msgid "Group"
 msgstr "群组"
 
-#: ../src/dialogs.py:141
+#: ../src/dialogs.py:135
 msgid "In the group"
 msgstr "群组内"
 
-#: ../src/dialogs.py:191
+#: ../src/dialogs.py:185
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:194
+#: ../src/dialogs.py:188
 msgid "Contact name"
 msgstr "联系人名"
 
-#: ../src/dialogs.py:227
+#: ../src/dialogs.py:221
 #, python-format
 msgid "%s Status Message"
 msgstr " %s 状态消息"
 
-#: ../src/dialogs.py:229
+#: ../src/dialogs.py:223
 msgid "Status Message"
 msgstr "状态消息"
 
-#: ../src/dialogs.py:298
+#: ../src/dialogs.py:292
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "请为账户 %s 填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:300
+#: ../src/dialogs.py:294
 msgid "Please fill in the data of the contact you want to add"
 msgstr "请填入您想增加的联系人数据"
 
-#: ../src/dialogs.py:380
+#: ../src/dialogs.py:374
 msgid "Invalid User ID"
 msgstr "无效的用户 ID"
 
-#: ../src/dialogs.py:387
+#: ../src/dialogs.py:382
 msgid "Contact already in roster"
 msgstr "联系人已经在名单中"
 
-#: ../src/dialogs.py:388
+#: ../src/dialogs.py:383
 msgid "This contact is already listed in your roster."
 msgstr "此联系人已在名单中。"
 
-#: ../src/dialogs.py:450
+#: ../src/dialogs.py:445
 msgid "A GTK+ jabber client"
 msgstr "一个 GTK+ 的 Jabber 客户端"
 
+#: ../src/dialogs.py:455
+msgid "Read AUTHORS file for full list including past developers"
+msgstr ""
+
+#: ../src/dialogs.py:457
+msgid "THANKS:"
+msgstr ""
+
+#. remove one english setence
+#. and add it manually as translatable
+#: ../src/dialogs.py:464
+msgid "Last but not least, we thank all the package maintainers"
+msgstr ""
+
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:475
+#: ../src/dialogs.py:477
 msgid "translator-credits"
-msgstr "wwld <wwld@radio.lzusiyu.org>\n"
+msgstr ""
+"wwld <wwld@radio.lzusiyu.org>\n"
 "kangkang <kanger@gmail.com>"
 
-#: ../src/dialogs.py:616
+#: ../src/dialogs.py:641
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "该认证要求来自帐户 %s 由 %s 发送"
 
-#: ../src/dialogs.py:619
+#: ../src/dialogs.py:644
 #, python-format
 msgid "Subscription request from %s"
 msgstr "来自 %s 的认证请求"
 
-#: ../src/dialogs.py:663
+#: ../src/dialogs.py:688
 msgid "You can not join a group chat unless you are connected."
 msgstr "请在加入群聊前先连接到服务器。"
 
-#: ../src/dialogs.py:674
+#: ../src/dialogs.py:701
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:676
-#: ../src/gtkgui.glade.h:177
+#: ../src/dialogs.py:703 ../src/gtkgui.glade.h:178
 msgid "Join Group Chat"
 msgstr "加入群聊"
 
-#: ../src/dialogs.py:756
+#: ../src/dialogs.py:792
+#, fuzzy
+msgid "Invalid room or server name"
+msgstr "无效用户名"
+
+#: ../src/dialogs.py:793
+msgid "The room name or server name has not allowed characters."
+msgstr ""
+
+#: ../src/dialogs.py:812
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "使用账户 %s 加入群聊"
 
-#: ../src/dialogs.py:758
+#: ../src/dialogs.py:814
 msgid "Start Chat"
 msgstr "开始聊天"
 
-#: ../src/dialogs.py:759
+#: ../src/dialogs.py:815
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -559,250 +662,229 @@ msgstr ""
 "联系人 ID："
 
 #. if offline or connecting
-#: ../src/dialogs.py:767
-#: ../src/dialogs.py:1145
-#: ../src/dialogs.py:1265
+#: ../src/dialogs.py:823 ../src/dialogs.py:1249 ../src/dialogs.py:1369
 msgid "Connection not available"
 msgstr "连接不可用"
 
-#: ../src/dialogs.py:768
-#: ../src/dialogs.py:1146
-#: ../src/dialogs.py:1266
+#: ../src/dialogs.py:824 ../src/dialogs.py:1250 ../src/dialogs.py:1370
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "请确认已连接到 “%s”。"
 
-#: ../src/dialogs.py:779
+#: ../src/dialogs.py:835
 msgid "Without a connection, you can not change your password."
 msgstr "连接后才可更改密码。"
 
-#: ../src/dialogs.py:798
+#: ../src/dialogs.py:854
 msgid "You must enter a password."
 msgstr "此处必须输入密码"
 
-#: ../src/dialogs.py:802
+#: ../src/dialogs.py:858
 msgid "Passwords do not match"
 msgstr "密码不符"
 
-#: ../src/dialogs.py:803
+#: ../src/dialogs.py:859
 msgid "The passwords typed in both fields must be identical."
 msgstr "两次密码输入不一致。"
 
-#. default value of txt
-#: ../src/dialogs.py:837
-#: ../src/gajim.py:389
-#: ../src/notify.py:115
+#: ../src/dialogs.py:905 ../src/gajim.py:363 ../src/notify.py:125
 msgid "Contact Signed In"
 msgstr "联系人登录"
 
-#: ../src/dialogs.py:842
-#: ../src/gajim.py:408
-#: ../src/notify.py:118
+#: ../src/dialogs.py:916 ../src/gajim.py:384 ../src/notify.py:132
 msgid "Contact Signed Out"
 msgstr "联系人退出登录"
 
 #. chat message
-#: ../src/dialogs.py:847
-#: ../src/gajim.py:489
-#: ../src/notify.py:121
-#: ../src/notify.py:133
+#: ../src/dialogs.py:927 ../src/dialogs.py:939 ../src/gajim.py:467
+#: ../src/notify.py:139 ../src/notify.py:151
 msgid "New Message"
 msgstr "新消息"
 
 #. single message
-#: ../src/dialogs.py:847
-#: ../src/gajim.py:487
-#: ../src/notify.py:121
+#: ../src/dialogs.py:927 ../src/gajim.py:465 ../src/notify.py:139
 msgid "New Single Message"
 msgstr "新消息"
 
-#: ../src/dialogs.py:848
-#: ../src/dialogs.py:852
-#: ../src/gajim.py:443
-#: ../src/notify.py:122
-#: ../src/notify.py:124
+#: ../src/dialogs.py:928 ../src/dialogs.py:932 ../src/gajim.py:422
+#: ../src/notify.py:140 ../src/notify.py:142
 msgid "New Private Message"
 msgstr "新的个人消息"
 
-#: ../src/dialogs.py:855
+#: ../src/dialogs.py:935
 #, python-format
 msgid "From %s in room %s"
 msgstr "来自 %s ,房间 %s "
 
-#: ../src/dialogs.py:857
-#: ../src/dialogs.py:863
-#: ../src/dialogs.py:880
+#: ../src/dialogs.py:938 ../src/dialogs.py:948 ../src/dialogs.py:968
 #, python-format
 msgid "From %s"
 msgstr "来自 %s"
 
-#: ../src/dialogs.py:859
-#: ../src/gajim.py:908
-#: ../src/notify.py:137
+#: ../src/dialogs.py:944 ../src/gajim.py:936 ../src/notify.py:155
 msgid "File Transfer Request"
 msgstr "文件传输请求"
 
 #. check if we should be notified
-#: ../src/dialogs.py:865
-#: ../src/gajim.py:833
-#: ../src/gajim.py:890
-#: ../src/notify.py:142
+#: ../src/dialogs.py:951 ../src/gajim.py:834 ../src/gajim.py:918
+#: ../src/notify.py:160
 msgid "File Transfer Error"
 msgstr "文件传输错误"
 
-#: ../src/dialogs.py:870
-#: ../src/gajim.py:939
-#: ../src/notify.py:145
-#: ../src/notify.py:154
-#: ../src/notify.py:171
+#: ../src/dialogs.py:957 ../src/dialogs.py:969 ../src/dialogs.py:982
+#: ../src/gajim.py:967 ../src/notify.py:163 ../src/notify.py:172
+#: ../src/notify.py:189
 msgid "File Transfer Completed"
 msgstr "文件传输完成"
 
-#: ../src/dialogs.py:870
-#: ../src/gajim.py:942
-#: ../src/notify.py:145
+#: ../src/dialogs.py:958 ../src/gajim.py:970 ../src/notify.py:163
 msgid "File Transfer Stopped"
 msgstr "文件传输已停止"
 
-#: ../src/dialogs.py:889
+#: ../src/dialogs.py:981
 #, python-format
 msgid "To %s"
 msgstr "到 %s"
 
+#: ../src/dialogs.py:989 ../src/gajim.py:841 ../src/notify.py:199
+msgid "New E-mail"
+msgstr ""
+
+#: ../src/dialogs.py:993 ../src/notify.py:200
+#, fuzzy, python-format
+msgid "You have %d new E-mail message"
+msgid_plural "You have %d new E-mail messages"
+msgstr[0] "您有未读消息"
+
+#: ../src/dialogs.py:994 ../src/notify.py:201
+#, python-format
+msgid "%(new_mail_gajim_ui_msg)s on %(gmail_mail_address)s"
+msgstr ""
+
 #. FIXME: for Received with should become 'in'
-#: ../src/dialogs.py:1077
+#: ../src/dialogs.py:1181
 #, python-format
 msgid "Single Message with account %s"
 msgstr "账户 %s 的消息"
 
-#: ../src/dialogs.py:1079
+#: ../src/dialogs.py:1183
 msgid "Single Message"
 msgstr "单条消息"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:1082
+#: ../src/dialogs.py:1186
 #, python-format
 msgid "Send %s"
 msgstr "发送 %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:1105
+#: ../src/dialogs.py:1209
 #, 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:1171
+#: ../src/dialogs.py:1275
 #, python-format
 msgid "RE: %s"
 msgstr "回复： %s"
 
-#: ../src/dialogs.py:1172
+#: ../src/dialogs.py:1276
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s 写道：\n"
 
-#: ../src/dialogs.py:1216
+#: ../src/dialogs.py:1320
 #, python-format
 msgid "XML Console for %s"
 msgstr "账户 %s 的 XML 控制台"
 
-#: ../src/dialogs.py:1218
+#: ../src/dialogs.py:1322
 msgid "XML Console"
 msgstr " XML 控制台"
 
-#: ../src/dialogs.py:1301
+#: ../src/dialogs.py:1405
 #, python-format
 msgid "You have been invited to the %(room_jid)s room by %(contact_jid)s"
 msgstr "您被邀请到 %(room_jid)s 房间，邀请人 %(contact_jid)s "
 
-#: ../src/dialogs.py:1304
+#: ../src/dialogs.py:1408
 #, python-format
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/disco.py:119
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "其他"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:123
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "会议"
 
-#: ../src/disco.py:422
+#: ../src/disco.py:421
 msgid "Without a connection, you can not browse available services"
 msgstr "连接后才可浏览可用服务"
 
-#: ../src/disco.py:499
-#: ../src/disco.py:501
+#: ../src/disco.py:498 ../src/disco.py:500
 msgid "Service Discovery"
 msgstr "搜索服务"
 
-#: ../src/disco.py:579
+#: ../src/disco.py:578
 msgid "The service could not be found"
 msgstr "找不到该服务"
 
-#: ../src/disco.py:580
-msgid "There is no service at the address you entered, or it is not responding. Check the address and try again."
+#: ../src/disco.py:579
+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:584
-#: ../src/disco.py:869
+#: ../src/disco.py:583 ../src/disco.py:868
 msgid "The service is not browsable"
 msgstr "该服务无法浏览"
 
-#: ../src/disco.py:585
+#: ../src/disco.py:584
 msgid "This type of service does not contain any items to browse."
 msgstr "此服务没有项目可浏览。"
 
-#: ../src/disco.py:665
+#: ../src/disco.py:664
 #, python-format
 msgid "Browsing %s"
 msgstr "浏览 %s"
 
-#. Address column
-#: ../src/disco.py:686
-msgid "JID"
-msgstr "JID"
-
-#: ../src/disco.py:705
+#: ../src/disco.py:704
 msgid "_Browse"
 msgstr "浏览(_B)"
 
-#: ../src/disco.py:870
+#: ../src/disco.py:869
 msgid "This service does not contain any items to browse."
 msgstr "此服务不包含任何项目可浏览。"
 
-#: ../src/disco.py:1091
-#: ../src/disco.py:1204
+#: ../src/disco.py:1090 ../src/disco.py:1207
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1099
-#: ../src/disco.py:1457
-#: ../src/gtkgui.glade.h:344
+#: ../src/disco.py:1098 ../src/disco.py:1460 ../src/gtkgui.glade.h:349
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/disco.py:1202
-#: ../src/gtkgui.glade.h:330
-#: ../src/roster_window.py:1075
+#: ../src/disco.py:1205 ../src/gtkgui.glade.h:335 ../src/roster_window.py:1102
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: ../src/disco.py:1241
+#: ../src/disco.py:1244
 #, python-format
 msgid "Scanning %d / %d.."
 msgstr "已扫描 %d / %d.."
 
 #. Users column
-#: ../src/disco.py:1423
+#: ../src/disco.py:1426
 msgid "Users"
 msgstr "用户"
 
 #. Description column
-#: ../src/disco.py:1430
+#: ../src/disco.py:1433
 msgid "Description"
 msgstr "描述"
 
@@ -818,33 +900,28 @@ msgstr "时间"
 msgid "Progress"
 msgstr "进程"
 
-#: ../src/filetransfers_window.py:174
-#: ../src/filetransfers_window.py:240
+#: ../src/filetransfers_window.py:174 ../src/filetransfers_window.py:240
 #, python-format
 msgid "Filename: %s"
 msgstr "文件名： %s"
 
-#: ../src/filetransfers_window.py:176
-#: ../src/filetransfers_window.py:310
+#: ../src/filetransfers_window.py:176 ../src/filetransfers_window.py:330
 #, 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:185
-#: ../src/filetransfers_window.py:195
+#: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:195
 msgid "You"
 msgstr "您"
 
-#: ../src/filetransfers_window.py:186
-#: ../src/filetransfers_window.py:242
+#: ../src/filetransfers_window.py:186 ../src/filetransfers_window.py:242
 #, python-format
 msgid "Sender: %s"
 msgstr "发送者： %s"
 
-#: ../src/filetransfers_window.py:187
-#: ../src/filetransfers_window.py:542
+#: ../src/filetransfers_window.py:187 ../src/filetransfers_window.py:565
 #: ../src/tooltips.py:490
 msgid "Recipient: "
 msgstr "接收者： %s"
@@ -858,18 +935,15 @@ msgstr "保存在： %s"
 msgid "File transfer completed"
 msgstr "文件传输已完成"
 
-#: ../src/filetransfers_window.py:203
-#: ../src/gtkgui.glade.h:362
+#: ../src/filetransfers_window.py:203 ../src/gtkgui.glade.h:367
 msgid "_Open Containing Folder"
 msgstr "打开文件夹(_O)"
 
-#: ../src/filetransfers_window.py:221
-#: ../src/filetransfers_window.py:229
+#: ../src/filetransfers_window.py:221 ../src/filetransfers_window.py:229
 msgid "File transfer canceled"
 msgstr "文件传输已取消"
 
-#: ../src/filetransfers_window.py:221
-#: ../src/filetransfers_window.py:230
+#: ../src/filetransfers_window.py:221 ../src/filetransfers_window.py:230
 msgid "Connection with peer cannot be established."
 msgstr "无法与对方建立连接。"
 
@@ -885,50 +959,55 @@ msgstr "选择要发送的文件..."
 msgid "Send"
 msgstr "发送"
 
-#: ../src/filetransfers_window.py:283
+#: ../src/filetransfers_window.py:284
 msgid "Gajim cannot access this file"
 msgstr "Gajim 无法访问此文件"
 
-#: ../src/filetransfers_window.py:284
+#: ../src/filetransfers_window.py:285
 msgid "This file is being used by another process."
 msgstr "此文件正在被其它程序使用。"
 
-#: ../src/filetransfers_window.py:308
+#: ../src/filetransfers_window.py:313 ../src/filetransfers_window.py:363
+msgid "This file already exists"
+msgstr "文件已经存在"
+
+#: ../src/filetransfers_window.py:313
+#, fuzzy
+msgid "What do you want to do?"
+msgstr "<b>想做什么？</b>"
+
+#: ../src/filetransfers_window.py:328
 #, python-format
 msgid "File: %s"
 msgstr "文件： %s"
 
-#: ../src/filetransfers_window.py:313
+#: ../src/filetransfers_window.py:333
 #, python-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: ../src/filetransfers_window.py:315
+#: ../src/filetransfers_window.py:335
 #, python-format
 msgid "Description: %s"
 msgstr "描述： %s"
 
-#: ../src/filetransfers_window.py:316
+#: ../src/filetransfers_window.py:336
 #, python-format
 msgid "%s wants to send you a file:"
 msgstr "%s 想发送给您一个文件："
 
-#: ../src/filetransfers_window.py:319
+#: ../src/filetransfers_window.py:339
 msgid "Save File as..."
 msgstr "另存为..."
 
-#: ../src/filetransfers_window.py:340
-msgid "This file already exists"
-msgstr "文件已经存在"
-
-#: ../src/filetransfers_window.py:341
+#: ../src/filetransfers_window.py:364
 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:413
+#: ../src/filetransfers_window.py:436
 #, python-format
 msgid "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
 msgstr "%(hours)02.d:%(minutes)02.d:%(seconds)02.d"
@@ -936,41 +1015,37 @@ 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:468
+#: ../src/filetransfers_window.py:491
 #, python-format
 msgid "(%(filesize_unit)s/s)"
 msgstr "(%(filesize_unit)s/s)"
 
-#: ../src/filetransfers_window.py:514
-#: ../src/filetransfers_window.py:517
+#: ../src/filetransfers_window.py:537 ../src/filetransfers_window.py:540
 msgid "Invalid File"
 msgstr "无效文件"
 
-#: ../src/filetransfers_window.py:514
+#: ../src/filetransfers_window.py:537
 msgid "File: "
 msgstr "文件："
 
-#: ../src/filetransfers_window.py:518
+#: ../src/filetransfers_window.py:541
 msgid "It is not possible to send empty files"
 msgstr "无法发送空文件"
 
-#: ../src/filetransfers_window.py:538
-#: ../src/tooltips.py:407
+#: ../src/filetransfers_window.py:561 ../src/tooltips.py:407
 #: ../src/tooltips.py:472
 msgid "Name: "
 msgstr "名称："
 
-#: ../src/filetransfers_window.py:540
-#: ../src/tooltips.py:485
+#: ../src/filetransfers_window.py:563 ../src/tooltips.py:485
 msgid "Sender: "
 msgstr "发送者："
 
-#: ../src/filetransfers_window.py:728
+#: ../src/filetransfers_window.py:752
 msgid "Pause"
 msgstr "暂停"
 
-#: ../src/filetransfers_window.py:739
-#: ../src/gtkgui.glade.h:324
+#: ../src/filetransfers_window.py:763 ../src/gtkgui.glade.h:329
 msgid "_Continue"
 msgstr "继续(_C)"
 
@@ -996,17 +1071,16 @@ msgid "Popups a window with the next unread message"
 msgstr "为下一条未读消息弹出窗口"
 
 #: ../src/gajim-remote.py:98
-msgid "Prints a list of all contacts in the roster. Each contact appear on a separate line"
+msgid ""
+"Prints a list of all contacts in the roster. Each contact appear on a "
+"separate line"
 msgstr "打印名单中所有联系人。每个联系人一行。"
 
-#: ../src/gajim-remote.py:100
-#: ../src/gajim-remote.py:113
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:136
-#: ../src/gajim-remote.py:151
-#: ../src/gajim-remote.py:181
-#: ../src/gajim-remote.py:189
-#: ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:136
+#: ../src/gajim-remote.py:151 ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:189 ../src/gajim-remote.py:196
+#: ../src/gajim-remote.py:203
 msgid "account"
 msgstr "账户"
 
@@ -1030,8 +1104,7 @@ msgstr "状态"
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "下列中的一项： 离线，在线，聊天，离开，不可用, dnd, 隐身"
 
-#: ../src/gajim-remote.py:112
-#: ../src/gajim-remote.py:133
+#: ../src/gajim-remote.py:112 ../src/gajim-remote.py:133
 msgid "message"
 msgstr "消息"
 
@@ -1040,7 +1113,9 @@ msgid "status message"
 msgstr "状态消息"
 
 #: ../src/gajim-remote.py:113
-msgid "change status of account \"account\". If not specified, try to change status of all accounts that have \"sync with global status\" option set"
+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:119
@@ -1051,14 +1126,18 @@ msgstr "显示对话框用于给联系人发送消息"
 msgid "JID of the contact that you want to chat with"
 msgstr "您想聊天的 JID"
 
-#: ../src/gajim-remote.py:123
-#: ../src/gajim-remote.py:181
+#: ../src/gajim-remote.py:123 ../src/gajim-remote.py:181
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr "如指定，将从此帐户列表下移出联系人"
 
 #: ../src/gajim-remote.py:128
-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 "发送新消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
+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 ""
+"发送新消息至名单中的联系人。 OpenPGP 密钥与帐户均可选。如果只选择“帐户”而不需"
+"要“ OpenPGP 密钥”，只需将“ OpenPGP 密钥”置为空。"
 
 #: ../src/gajim-remote.py:132
 msgid "JID of the contact that will receive the message"
@@ -1084,8 +1163,7 @@ msgstr "如指定，消息将被用此账户发送"
 msgid "Gets detailed info on a contact"
 msgstr "获得联系人的详细信息"
 
-#: ../src/gajim-remote.py:143
-#: ../src/gajim-remote.py:150
+#: ../src/gajim-remote.py:143 ../src/gajim-remote.py:150
 #: ../src/gajim-remote.py:180
 msgid "JID of the contact"
 msgstr "联系人的 JID "
@@ -1154,11 +1232,17 @@ msgstr "为此账户加入新联系人。"
 msgid "Returns current status (the global one unless account is specified)"
 msgstr "返回当前状态(如不指定账户将返回全局设置)"
 
-#: ../src/gajim-remote.py:217
+#: ../src/gajim-remote.py:201
+#, fuzzy
+msgid ""
+"Returns current status message(the global one unless account is specified)"
+msgstr "返回当前状态(如不指定账户将返回全局设置)"
+
+#: ../src/gajim-remote.py:223
 msgid "Missing argument \"contact_jid\""
 msgstr "缺失的“联系人 JID”参数"
 
-#: ../src/gajim-remote.py:240
+#: ../src/gajim-remote.py:246
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -1167,16 +1251,16 @@ msgstr ""
 "\"%s\" 不是您的名单中。\n"
 "请为发送此消息指定账户。"
 
-#: ../src/gajim-remote.py:243
+#: ../src/gajim-remote.py:249
 msgid "You have no active account"
 msgstr "没有活动的账户"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:283
 #, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "未知的 D-Bus 版本： %s"
 
-#: ../src/gajim-remote.py:304
+#: ../src/gajim-remote.py:310
 #, python-format
 msgid ""
 "Usage: %s %s %s \n"
@@ -1185,16 +1269,16 @@ msgstr ""
 "用法： %s %s %s \n"
 "\t"
 
-#: ../src/gajim-remote.py:307
+#: ../src/gajim-remote.py:313
 msgid "Arguments:"
 msgstr "参数："
 
-#: ../src/gajim-remote.py:311
+#: ../src/gajim-remote.py:317
 #, python-format
 msgid "%s not found"
 msgstr " %s 未找到"
 
-#: ../src/gajim-remote.py:315
+#: ../src/gajim-remote.py:321
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -1203,7 +1287,7 @@ msgstr ""
 "用法：%s 命令 [参数] \n"
 "命令是下列之一：\n"
 
-#: ../src/gajim-remote.py:524
+#: ../src/gajim-remote.py:530
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -1212,95 +1296,89 @@ msgstr ""
 "参数“%s”未指定。\n"
 "输入“%s help %s”以获取更多信息"
 
-#: ../src/gajim.py:45
+#: ../src/gajim.py:49
 msgid "Gajim needs Xserver to run. Quiting..."
 msgstr "运行 Gajim 需要 X 服务器。退出..."
 
-#: ../src/gajim.py:49
+#: ../src/gajim.py:53
 msgid "Gajim needs PyGTK 2.6 or above"
 msgstr "Gajim 需要 PyGTK 2.6 或更高版本"
 
-#: ../src/gajim.py:50
+#: ../src/gajim.py:54
 msgid "Gajim needs PyGTK 2.6 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 PyGTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:52
+#: ../src/gajim.py:56
 msgid "Gajim needs GTK 2.6 or above"
 msgstr "Gajim 需要 GTK 2.6 或更高版本"
 
-#: ../src/gajim.py:53
+#: ../src/gajim.py:57
 msgid "Gajim needs GTK 2.6 or above to run. Quiting..."
 msgstr "运行 Gajim 需要 GTK 2.6 或更高版本。退出..."
 
-#: ../src/gajim.py:58
+#: ../src/gajim.py:62
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ 运行时环境缺少 libglade 支持"
 
-#: ../src/gajim.py:60
+#: ../src/gajim.py:64
 #, python-format
-msgid "Please remove your current GTK+ runtime and install the latest stable version from %s"
+msgid ""
+"Please remove your current GTK+ runtime and install the latest stable "
+"version from %s"
 msgstr "请移除当前的 GTK+ 运行时环境并从 %s 安装最新稳定版本"
 
-#: ../src/gajim.py:62
-msgid "Please make sure that gtk and pygtk have libglade support in your system."
+#: ../src/gajim.py:66
+#, fuzzy
+msgid ""
+"Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "请确定您系统中的的 gtk 及 pygtk 支持 libglade。"
 
-#: ../src/gajim.py:67
+#: ../src/gajim.py:71
 msgid "Gajim needs PySQLite2 to run"
 msgstr "运行 Gajim 需要 PySQLite2 "
 
 #. ('HTTP_AUTH', account, (method, url, transaction_id, iq_obj))
-#: ../src/gajim.py:213
+#: ../src/gajim.py:187
 #, python-format
 msgid "HTTP (%s) Authorization for %s (id: %s)"
 msgstr "HTTP (%s) 授权给 %s (id: %s)"
 
-#: ../src/gajim.py:214
+#: ../src/gajim.py:188
 msgid "Do you accept this request?"
 msgstr "是否接受这个请求？"
 
-#: ../src/gajim.py:535
+#: ../src/gajim.py:515
 msgid "error while sending"
 msgstr "发送时出现错误"
 
-#: ../src/gajim.py:562
-#: ../src/gajim.py:573
-#: ../src/gtkgui.glade.h:143
-#: ../src/roster_window.py:154
-#: ../src/roster_window.py:1237
-msgid "General"
-msgstr "常规"
-
-#: ../src/gajim.py:578
+#: ../src/gajim.py:556
 msgid "Authorization accepted"
 msgstr "授权被接受"
 
-#: ../src/gajim.py:579
+#: ../src/gajim.py:557
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "联系人“%s”已授权您查看他/她的状态。"
 
-#: ../src/gajim.py:585
+#: ../src/gajim.py:564
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "联系人“%s”移除了来自您的认证"
 
-#: ../src/gajim.py:586
+#: ../src/gajim.py:565
 msgid "You will always see him or her as offline."
 msgstr "您将一直看到他/她的状态为离线。"
 
-#: ../src/gajim.py:610
+#: ../src/gajim.py:591
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "无法与对方“ %s ”建立连接。"
 
-#: ../src/gajim.py:611
-#: ../src/common/connection.py:1637
+#: ../src/gajim.py:592 ../src/common/connection.py:1758
 msgid "Check your connection or try again later."
 msgstr "检查连接并稍后重试。"
 
-#: ../src/gajim.py:720
-#: ../src/roster_window.py:716
+#: ../src/gajim.py:704 ../src/roster_window.py:740
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s 正在 %s (%s)."
@@ -1313,42 +1391,55 @@ msgstr "您的密文不正确"
 msgid "You are currently connected without your OpenPGP key."
 msgstr "已建立没有 OpenPGP 密钥的连接"
 
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1002
 msgid "vCard publication succeeded"
 msgstr " vCard 发布成功"
 
-#: ../src/gajim.py:974
+#: ../src/gajim.py:1002
 msgid "Your personal information has been published successfully."
 msgstr "您的个人信息被成功发布。"
 
-#: ../src/gajim.py:977
+#: ../src/gajim.py:1005
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/gajim.py:977
-msgid "There was an error while publishing your personal information, try again later."
+#: ../src/gajim.py:1005
+msgid ""
+"There was an error while publishing your personal information, try again "
+"later."
 msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1265
+#: ../src/gajim.py:1296
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
+#: ../src/gajim.py:1502
+#, fuzzy
+msgid "GUI Migration failed"
+msgstr "vCard 发布失败"
+
+#: ../src/gajim.py:1505
+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:1469
+#: ../src/gajim.py:1513
 msgid "Logs have been successfully migrated to the database."
 msgstr "日志被成功移动到数据库。"
 
-#: ../src/gajim.py:1488
+#: ../src/gajim.py:1532
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
-#: ../src/gajim.py:1543
+#: ../src/gajim.py:1587
 msgid "Migrating Logs..."
 msgstr "正在移动日志..."
 
-#: ../src/gajim.py:1543
+#: ../src/gajim.py:1587
 msgid "Please wait while logs are being migrated..."
 msgstr "请等待日志被移动..."
 
@@ -1369,234 +1460,250 @@ msgstr "无法删除当前主题"
 msgid "Please first choose another for your current theme."
 msgstr "请先选择其他主题作为当前主题"
 
-#. if we are in many rooms
-#: ../src/groupchat_window.py:156
-#, python-format
-msgid "Are you sure you want to leave rooms \"%s\"?"
-msgstr "确定要离开房间“ %s ”？"
+#: ../src/groupchat_control.py:63
+msgid "Private chat"
+msgstr ""
 
-#: ../src/groupchat_window.py:157
-msgid "If you close this window, you will be disconnected from these rooms."
-msgstr "如果关闭此窗口，您将断开这些房间的连接。"
+#: ../src/groupchat_control.py:79
+msgid "Sending private message failed"
+msgstr "发送私有消息失败"
 
-#. just in one room
-#: ../src/groupchat_window.py:160
+#. in second %s code replaces with nickname
+#: ../src/groupchat_control.py:81
 #, python-format
-msgid "Are you sure you want to leave room \"%s\"?"
-msgstr "确定要离开房间“ %s ”？"
-
-#: ../src/groupchat_window.py:161
-msgid "If you close this window, you will be disconnected from this room."
-msgstr "如果关闭此窗口，您将断开此房间的连接。"
+msgid "You are no longer in room \"%s\" or \"%s\" has left."
+msgstr "您不再在房间“%s”中或“%s”已离开。"
 
-#: ../src/groupchat_window.py:165
-msgid "Do _not ask me again"
-msgstr "不再提问此问题（_N）"
+#: ../src/groupchat_control.py:93
+msgid "Group Chat"
+msgstr "群聊"
 
-#: ../src/groupchat_window.py:303
-#: ../src/groupchat_window.py:539
+#: ../src/groupchat_control.py:519
 msgid "This room has no subject"
 msgstr "该房间无话题"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_window.py:461
+#: ../src/groupchat_control.py:604
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s 被踢出：%(reason)s"
 
-#: ../src/groupchat_window.py:465
+#: ../src/groupchat_control.py:608
 #, 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_window.py:472
+#: ../src/groupchat_control.py:615
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s 被封禁：%(reason)s"
 
-#: ../src/groupchat_window.py:476
+#: ../src/groupchat_control.py:619
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s 被 %(who)s 封禁：%(reason)s"
 
-#: ../src/groupchat_window.py:484
+#: ../src/groupchat_control.py:627
 #, python-format
 msgid "You are now known as %s"
 msgstr "您现在成了 %s "
 
-#: ../src/groupchat_window.py:486
+#: ../src/groupchat_control.py:629
 #, python-format
 msgid "%s is now known as %s"
 msgstr "%s 现在成了 %s"
 
-#: ../src/groupchat_window.py:521
+#: ../src/groupchat_control.py:667
 #, python-format
 msgid "%s has left"
 msgstr " %s 离开了"
 
-#: ../src/groupchat_window.py:523
+#: ../src/groupchat_control.py:669
 #, python-format
 msgid "%s is now %s"
 msgstr "%s 正在 %s"
 
-#: ../src/groupchat_window.py:560
-msgid "Changing Subject"
-msgstr "正在更换话题"
-
-#: ../src/groupchat_window.py:561
-msgid "Please specify the new subject:"
-msgstr "请指定新话题："
-
-#: ../src/groupchat_window.py:570
-msgid "Changing Nickname"
-msgstr "正在更换昵称"
-
-#: ../src/groupchat_window.py:571
-msgid "Please specify the new nickname you want to use:"
-msgstr "请指定您想使用的新昵称："
-
-#: ../src/groupchat_window.py:601
-msgid "Bookmark already set"
-msgstr "书签已设定"
-
-#: ../src/groupchat_window.py:602
-#, python-format
-msgid "Room \"%s\" is already in your bookmarks."
-msgstr "房间“%s”已在您的书签中。"
-
-#: ../src/groupchat_window.py:612
-msgid "Bookmark has been added successfully"
-msgstr "书签添加成功"
-
-#: ../src/groupchat_window.py:613
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "您可以通过“动作”菜单管理您的名单。"
-
-#. we are not connected
-#: ../src/groupchat_window.py:743
-#: ../src/tabbed_chat_window.py:662
-msgid "A connection is not available"
-msgstr "连接不可用"
-
-#: ../src/groupchat_window.py:744
-#: ../src/tabbed_chat_window.py:663
-msgid "Your message can not be sent until you are connected."
-msgstr "连接之后您的消息才能发送"
-
-#: ../src/groupchat_window.py:815
-#: ../src/groupchat_window.py:831
-#: ../src/groupchat_window.py:919
-#: ../src/groupchat_window.py:934
+#: ../src/groupchat_control.py:771 ../src/groupchat_control.py:787
+#: ../src/groupchat_control.py:881 ../src/groupchat_control.py:896
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "昵称未找到： %s "
 
-#: ../src/groupchat_window.py:856
+#: ../src/groupchat_control.py:813
 #, 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_window.py:863
-#: ../src/groupchat_window.py:892
+#: ../src/groupchat_control.py:820 ../src/groupchat_control.py:850
 #, python-format
 msgid "%s does not appear to be a valid JID"
 msgstr " %s 可能不是有效的 JID "
 
-#: ../src/groupchat_window.py:954
-#, python-format
-msgid "No such command: /%s (if you want to sent this prefix it with /say)"
+#: ../src/groupchat_control.py:917
+#, fuzzy, python-format
+msgid "No such command: /%s (if you want to send this, prefix it with /say)"
 msgstr "没有此命令：/%s (如果想送出此前缀请用 /say)"
 
-#: ../src/groupchat_window.py:965
+#: ../src/groupchat_control.py:939
 #, python-format
 msgid "Commands: %s"
 msgstr "命令： %s "
 
-#: ../src/groupchat_window.py:967
+#: ../src/groupchat_control.py:941
 #, python-format
-msgid "Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname of an occupant may be substituted, but not if it contains \"@\". If the JID is currently in the room, he/she/it will also be kicked. Does NOT support spaces in nickname."
-msgstr "用法：/%s <昵称|JID> [原因]，从此房间封禁 JID。昵称可能被代替，除了包含“@”。如果 JID 在房间里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
+msgid ""
+"Usage: /%s <nickname|JID> [reason], bans the JID from the room. The nickname "
+"of an occupant may be substituted, but not if it contains \"@\". If the JID "
+"is currently in the room, he/she/it will also be kicked. Does NOT support "
+"spaces in nickname."
+msgstr ""
+"用法：/%s <昵称|JID> [原因]，从此房间封禁 JID。昵称可能被代替，除了包含“@”。"
+"如果 JID 在房间里，他/她/它将被踢出。注意：不支持包含空格的昵称。"
 
-#: ../src/groupchat_window.py:973
+#: ../src/groupchat_control.py:947
 #, python-format
-msgid "Usage: /%s <nickname>, opens a private chat window to the specified occupant."
+msgid ""
+"Usage: /%s <nickname>, opens a private chat window to the specified occupant."
 msgstr "用法：/%s <昵称>, 为指定房主打开一个私聊窗口"
 
-#: ../src/groupchat_window.py:976
+#: ../src/groupchat_control.py:950
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "用法：/%s，清除文本窗口。"
 
-#: ../src/groupchat_window.py:979
+#: ../src/groupchat_control.py:952
 #, python-format
-msgid "Usage: /%s [reason], closes the current window or tab, displaying reason if specified."
+msgid ""
+"Usage: /%s [reason], closes the current window or tab, displaying reason if "
+"specified."
 msgstr "用法：/%s [原因]，关闭当前窗口或标签，如果指定将显示原因。"
 
-#: ../src/groupchat_window.py:982
+#: ../src/groupchat_control.py:955
 #, python-format
 msgid "Usage: /%s, sets the groupchat window to compact mode."
 msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
 
-#: ../src/groupchat_window.py:985
+#: ../src/groupchat_control.py:958
 #, python-format
-msgid "Usage: /%s <JID> [reason], invites JID to the current room, optionally providing a reason."
+msgid ""
+"Usage: /%s <JID> [reason], invites JID to the current room, optionally "
+"providing a reason."
 msgstr "用法：/%s <JID> [原因]，邀请 JID 到当前房间，可以提供一个原因。"
 
-#: ../src/groupchat_window.py:988
+#: ../src/groupchat_control.py:961
 #, python-format
-msgid "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally using specified nickname."
+msgid ""
+"Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
+"using specified nickname."
 msgstr "用法: /%s <房间>@<服务器>[/昵称], 申请以指定昵称加入“房间@服务器”。"
 
-#: ../src/groupchat_window.py:991
+#: ../src/groupchat_control.py:965
 #, python-format
-msgid "Usage: /%s <nickname> [reason], removes the occupant specified by nickname from the room and optionally displays a reason. Does NOT support spaces in nickname."
-msgstr "用法：/%s <昵称> [原因]，通过昵称移除房主，原因可选。注意：不支持含空格的昵称。"
+msgid ""
+"Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
+"from the room and optionally displays a reason. Does NOT support spaces in "
+"nickname."
+msgstr ""
+"用法：/%s <昵称> [原因]，通过昵称移除房主，原因可选。注意：不支持含空格的昵"
+"称。"
 
-#: ../src/groupchat_window.py:995
+#: ../src/groupchat_control.py:970
 #, python-format
-msgid "Usage: /%s <action>, sends action to the current room. Use third person. (e.g. /%s explodes.)"
-msgstr "用法：/%s <动作>，发送动作到当前房间。使用第三人称。(例如：/%s exploeds)"
+msgid ""
+"Usage: /%s <action>, sends action to the current room. Use third person. (e."
+"g. /%s explodes.)"
+msgstr ""
+"用法：/%s <动作>，发送动作到当前房间。使用第三人称。(例如：/%s exploeds)"
 
-#: ../src/groupchat_window.py:999
+#: ../src/groupchat_control.py:974
 #, python-format
-msgid "Usage: /%s <nickname> [message], opens a private message window and sends message to the occupant specified by nickname."
+msgid ""
+"Usage: /%s <nickname> [message], opens a private message window and sends "
+"message to the occupant specified by nickname."
 msgstr "用法： /%s <昵称> [消息], 向以昵称指定的房主发送消息并打开私聊窗口。 "
 
-#: ../src/groupchat_window.py:1002
+#: ../src/groupchat_control.py:978
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current room."
 msgstr "用法：/%s <昵称>，改变昵称。"
 
-#: ../src/groupchat_window.py:1005
+#: ../src/groupchat_control.py:981
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current room topic."
 msgstr "用法：/%s [主题]，显示或更新房间的主题。"
 
-#: ../src/groupchat_window.py:1008
+#: ../src/groupchat_control.py:984
 #, python-format
-msgid "Usage: /%s <message>, sends a message without looking for other commands."
+msgid ""
+"Usage: /%s <message>, sends a message without looking for other commands."
 msgstr "用法：/%s <消息>，不使用其他命令发送消息。"
 
-#: ../src/groupchat_window.py:1010
+#: ../src/groupchat_control.py:987
 #, python-format
 msgid "No help info for /%s"
 msgstr "没有 /%s 的帮助信息"
 
-#. ask for reason
-#: ../src/groupchat_window.py:1095
+#: ../src/groupchat_control.py:1022
 #, python-format
-msgid "Kicking %s"
+msgid "Are you sure you want to leave room \"%s\"?"
+msgstr "确定要离开房间“ %s ”？"
+
+#: ../src/groupchat_control.py:1023
+msgid "If you close this window, you will be disconnected from this room."
+msgstr "如果关闭此窗口，您将断开此房间的连接。"
+
+#: ../src/groupchat_control.py:1027
+#, fuzzy, python-format
+msgid "Do _not ask me about closing \"%s\" again"
+msgstr "不再提问此问题（_N）"
+
+#: ../src/groupchat_control.py:1061
+msgid "Changing Subject"
+msgstr "正在更换话题"
+
+#: ../src/groupchat_control.py:1062
+msgid "Please specify the new subject:"
+msgstr "请指定新话题："
+
+#: ../src/groupchat_control.py:1070
+msgid "Changing Nickname"
+msgstr "正在更换昵称"
+
+#: ../src/groupchat_control.py:1071
+msgid "Please specify the new nickname you want to use:"
+msgstr "请指定您想使用的新昵称："
+
+#: ../src/groupchat_control.py:1089
+msgid "Bookmark already set"
+msgstr "书签已设定"
+
+#: ../src/groupchat_control.py:1090
+#, python-format
+msgid "Room \"%s\" is already in your bookmarks."
+msgstr "房间“%s”已在您的书签中。"
+
+#: ../src/groupchat_control.py:1100
+msgid "Bookmark has been added successfully"
+msgstr "书签添加成功"
+
+#: ../src/groupchat_control.py:1101
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "您可以通过“动作”菜单管理您的名单。"
+
+#. ask for reason
+#: ../src/groupchat_control.py:1210
+#, python-format
+msgid "Kicking %s"
 msgstr "踢出 %s"
 
-#: ../src/groupchat_window.py:1096
-#: ../src/groupchat_window.py:1127
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1453
 msgid "You may specify a reason below:"
 msgstr "您可以指定一个原因："
 
 #. ask for reason
-#: ../src/groupchat_window.py:1126
+#: ../src/groupchat_control.py:1452
 #, python-format
 msgid "Banning %s"
 msgstr "封禁 %s"
@@ -1606,7 +1713,9 @@ msgid "A programming error has been detected"
 msgstr "发现一个程序错误"
 
 #: ../src/gtkexcepthook.py:53
-msgid "It probably is not fatal, but should be reported to the developers nonetheless."
+msgid ""
+"It probably is not fatal, but should be reported to the developers "
+"nonetheless."
 msgstr "它可能不是致命的，但仍应该提交给开发者。"
 
 #: ../src/gtkexcepthook.py:59
@@ -1751,42 +1860,38 @@ msgid "Accounts"
 msgstr "帐户"
 
 #: ../src/gtkgui.glade.h:37
-msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "启用/关闭文件传送完成提示"
-
-#: ../src/gtkgui.glade.h:38
 msgid "Ad_vanced Actions"
 msgstr "高级动作(_V)"
 
-#: ../src/gtkgui.glade.h:39
+#: ../src/gtkgui.glade.h:38
 msgid "Add New Contact"
 msgstr "添加联系人"
 
-#: ../src/gtkgui.glade.h:40
+#: ../src/gtkgui.glade.h:39
 msgid "Add _Contact"
 msgstr "添加联系人(_C)"
 
-#: ../src/gtkgui.glade.h:41
+#: ../src/gtkgui.glade.h:40
 msgid "Address"
 msgstr "地址"
 
-#: ../src/gtkgui.glade.h:42
+#: ../src/gtkgui.glade.h:41
 msgid "Advanced"
 msgstr "高级"
 
-#: ../src/gtkgui.glade.h:43
+#: ../src/gtkgui.glade.h:42
 msgid "Advanced Configuration Editor"
 msgstr "高级设置编辑器"
 
-#: ../src/gtkgui.glade.h:44
+#: ../src/gtkgui.glade.h:43
 msgid "After nickname:"
 msgstr "在昵称后："
 
-#: ../src/gtkgui.glade.h:45
+#: ../src/gtkgui.glade.h:44
 msgid "After time:"
 msgstr "在时间后："
 
-#: ../src/gtkgui.glade.h:46
+#: ../src/gtkgui.glade.h:45
 msgid ""
 "All chat states\n"
 "Composing only\n"
@@ -1796,55 +1901,61 @@ msgstr ""
 "仅在书写\n"
 "禁用"
 
-#: ../src/gtkgui.glade.h:49
+#: ../src/gtkgui.glade.h:48
 msgid "Allow _OS information to be sent"
 msgstr "允许发送操作系统信息(_O)"
 
-#: ../src/gtkgui.glade.h:50
+#: ../src/gtkgui.glade.h:49
 msgid "Allow him/her to see my status"
 msgstr "允许他人看到我的状态"
 
-#: ../src/gtkgui.glade.h:51
+#: ../src/gtkgui.glade.h:50
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
 msgstr "允许提示，当我离开/不可用/忙/隐身"
 
-#: ../src/gtkgui.glade.h:52
+#: ../src/gtkgui.glade.h:51
 msgid "Also known as iChat style"
 msgstr "也就是 i 聊天风格"
 
-#: ../src/gtkgui.glade.h:53
+#: ../src/gtkgui.glade.h:52
+msgid ""
+"Animated\n"
+"Static"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:54
 msgid "Ask status message when I:"
 msgstr "询问状态消息，当我："
 
-#: ../src/gtkgui.glade.h:54
+#: ../src/gtkgui.glade.h:55
 msgid "Ask to see his/her status"
 msgstr "要求查看他人的状态"
 
-#: ../src/gtkgui.glade.h:55
+#: ../src/gtkgui.glade.h:56
 msgid "Ask:"
 msgstr "请求："
 
-#: ../src/gtkgui.glade.h:56
+#: ../src/gtkgui.glade.h:57
 msgid "Assign Open_PGP Key"
 msgstr "指定 Open_PGP 密钥"
 
-#: ../src/gtkgui.glade.h:57
+#: ../src/gtkgui.glade.h:58
 msgid "Authorize contact so he can know when you're connected"
 msgstr "向联系人授权，使他知道您是否连接"
 
-#: ../src/gtkgui.glade.h:58
+#: ../src/gtkgui.glade.h:59
 msgid "Auto _away after:"
 msgstr "自动离开(_A)："
 
-#: ../src/gtkgui.glade.h:59
+#: ../src/gtkgui.glade.h:60
 msgid "Auto _not available after:"
 msgstr "自动不可用(_N)："
 
-#: ../src/gtkgui.glade.h:60
+#: ../src/gtkgui.glade.h:61
 msgid "Auto join"
 msgstr "自动加入"
 
-#: ../src/gtkgui.glade.h:61
+#: ../src/gtkgui.glade.h:62
 msgid ""
 "Autodetect on every Gajim startup\n"
 "Always use GNOME default applications\n"
@@ -1856,916 +1967,1001 @@ msgstr ""
 "总是使用 KDE 默认应用\n"
 "自定义"
 
-#: ../src/gtkgui.glade.h:65
+#: ../src/gtkgui.glade.h:66
 msgid "Automatically authorize contact"
 msgstr "自动向联系人授权"
 
-#: ../src/gtkgui.glade.h:66
+#: ../src/gtkgui.glade.h:67
 msgid "Autoreconnect when connection is lost"
 msgstr "连接丢失后自动重新连接"
 
-#: ../src/gtkgui.glade.h:67
+#: ../src/gtkgui.glade.h:68
 msgid "Before nickname:"
 msgstr "在昵称前："
 
-#: ../src/gtkgui.glade.h:68
+#: ../src/gtkgui.glade.h:69
 msgid "Before time:"
 msgstr "在时间前："
 
-#: ../src/gtkgui.glade.h:69
+#: ../src/gtkgui.glade.h:70
 msgid "Birthday:"
 msgstr "生日"
 
-#: ../src/gtkgui.glade.h:70
+#: ../src/gtkgui.glade.h:71
 msgid "Bold"
 msgstr "粗体"
 
-#: ../src/gtkgui.glade.h:71
+#: ../src/gtkgui.glade.h:72
 msgid "Build custom query"
 msgstr "建立自定义查询"
 
-#: ../src/gtkgui.glade.h:72
+#: ../src/gtkgui.glade.h:73
 msgid "C_onnect on Gajim startup"
 msgstr "Gajim 启动是连接(_O)"
 
-#: ../src/gtkgui.glade.h:73
+#: ../src/gtkgui.glade.h:74
 msgid "Cancel file transfer"
 msgstr "取消文件传输"
 
-#: ../src/gtkgui.glade.h:74
+#: ../src/gtkgui.glade.h:75
 msgid "Cancels the selected file transfer"
 msgstr "取消指定文件传输"
 
-#: ../src/gtkgui.glade.h:75
+#: ../src/gtkgui.glade.h:76
 msgid "Cancels the selected file transfer and removes incomplete file"
 msgstr "取消指定文件传输并删除未完成文件"
 
-#: ../src/gtkgui.glade.h:76
+#: ../src/gtkgui.glade.h:77
 msgid "Chan_ge Password"
 msgstr "更换密码(_G)"
 
-#: ../src/gtkgui.glade.h:77
+#: ../src/gtkgui.glade.h:78
 msgid "Change Password"
 msgstr "更换密码"
 
-#: ../src/gtkgui.glade.h:78
+#: ../src/gtkgui.glade.h:79
 msgid "Change _Nickname"
 msgstr "更换昵称(_N)"
 
-#: ../src/gtkgui.glade.h:79
+#: ../src/gtkgui.glade.h:80
 msgid "Change _Subject"
 msgstr "更换主题(_S)"
 
-#: ../src/gtkgui.glade.h:81
+#: ../src/gtkgui.glade.h:82
 msgid "Chat state noti_fications:"
 msgstr "聊天状态指示(_F)："
 
-#: ../src/gtkgui.glade.h:82
-msgid "Check this option, only if someone you don't have in the roster spams/annoys you. Use with caution, cause it blocks all messages from any contact that is not in the roster"
-msgstr "当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，请谨慎使用。"
-
 #: ../src/gtkgui.glade.h:83
-msgid "Check this so Gajim will connect in port 5223 where legacy servers are expected to have SSL capabilities. Note that Gajim uses TLS encryption by default if broadcasted by the server, and with this option enabled TLS will be disabled"
-msgstr "检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim 使用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
+msgid ""
+"Check this option, only if someone you don't have in the roster spams/annoys "
+"you. Use with caution, cause it blocks all messages from any contact that is "
+"not in the roster"
+msgstr ""
+"当被不在名单中的联系人骚扰时，检查此选项。它会屏蔽所有名单之外联系人的消息，"
+"请谨慎使用。"
 
 #: ../src/gtkgui.glade.h:84
+msgid ""
+"Check this so Gajim will connect in port 5223 where legacy servers are "
+"expected to have SSL capabilities. Note that Gajim uses TLS encryption by "
+"default if broadcasted by the server, and with this option enabled TLS will "
+"be disabled"
+msgstr ""
+"检查这里， Gajim 将连接代理服务器具有 SSL 能力的 5523 端口。注意， Gajim 使"
+"用 TLS 加密接受服务器广播，而使用该选项将禁用 TLS"
+
+#: ../src/gtkgui.glade.h:85
 msgid "Choose _Key..."
 msgstr "选择您的 OpenPGP 钥匙(_K)..."
 
-#: ../src/gtkgui.glade.h:85
+#: ../src/gtkgui.glade.h:86
 msgid "City:"
 msgstr "城市："
 
-#: ../src/gtkgui.glade.h:86
+#: ../src/gtkgui.glade.h:87
 msgid "Clean _up"
 msgstr "清除(_U)"
 
-#: ../src/gtkgui.glade.h:87
+#: ../src/gtkgui.glade.h:88
 msgid "Click to change account's password"
 msgstr "点击变更帐户密码"
 
-#: ../src/gtkgui.glade.h:88
-msgid "Click to insert an emoticon (Alt+E)"
+#: ../src/gtkgui.glade.h:89
+#, fuzzy
+msgid "Click to insert an emoticon (Alt+M)"
 msgstr "点击添加表情符 (Alt+E)"
 
-#: ../src/gtkgui.glade.h:89
+#: ../src/gtkgui.glade.h:90
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
 msgstr "点击查看 jabber 服务器特性(如 MSN, ICQ 代理)"
 
-#: ../src/gtkgui.glade.h:90
+#: ../src/gtkgui.glade.h:91
 msgid "Click to see past conversation in this room"
 msgstr "点击查看本房间的历史对话"
 
-#: ../src/gtkgui.glade.h:91
+#: ../src/gtkgui.glade.h:92
 msgid "Click to see past conversations with this contact"
 msgstr "点击查看与该联系人的历史对话"
 
-#: ../src/gtkgui.glade.h:92
+#: ../src/gtkgui.glade.h:93
 msgid "Client:"
 msgstr "客户端："
 
-#: ../src/gtkgui.glade.h:93
+#: ../src/gtkgui.glade.h:94
 msgid "Company:"
 msgstr "公司："
 
-#: ../src/gtkgui.glade.h:94
+#: ../src/gtkgui.glade.h:95
 msgid "Configure _Room"
 msgstr "设置房间(_R)"
 
-#: ../src/gtkgui.glade.h:95
+#: ../src/gtkgui.glade.h:96
 msgid "Connect when I press Finish"
 msgstr "当我点击“结束”时连接"
 
-#: ../src/gtkgui.glade.h:96
+#: ../src/gtkgui.glade.h:97
 msgid "Connection"
 msgstr "连接"
 
-#: ../src/gtkgui.glade.h:97
+#: ../src/gtkgui.glade.h:98
 msgid "Contact Information"
 msgstr "联系人信息"
 
-#: ../src/gtkgui.glade.h:98
+#: ../src/gtkgui.glade.h:99
 msgid "Contact _Info"
 msgstr "联系人信息(_I)"
 
-#: ../src/gtkgui.glade.h:99
+#: ../src/gtkgui.glade.h:100
 msgid "Conversation History"
 msgstr "对话历史"
 
-#: ../src/gtkgui.glade.h:100
+#: ../src/gtkgui.glade.h:101
 msgid "Country:"
 msgstr "国家："
 
-#: ../src/gtkgui.glade.h:101
+#: ../src/gtkgui.glade.h:102
 msgid "Default _status iconset:"
 msgstr "默认状态图标设置(_S)"
 
-#: ../src/gtkgui.glade.h:102
+#: ../src/gtkgui.glade.h:103
 msgid "Delete MOTD"
 msgstr "删除 MOTD"
 
-#: ../src/gtkgui.glade.h:103
+#: ../src/gtkgui.glade.h:104
 msgid "Delete Message of the Day"
 msgstr "删除每日消息"
 
-#: ../src/gtkgui.glade.h:104
+#: ../src/gtkgui.glade.h:105
 msgid "Deletes Message of the Day"
 msgstr "删除每日消息"
 
-#: ../src/gtkgui.glade.h:105
+#: ../src/gtkgui.glade.h:106
 msgid "Deny"
 msgstr "拒绝"
 
-#: ../src/gtkgui.glade.h:106
+#: ../src/gtkgui.glade.h:107
 msgid "Deny authorization from contact so he cannot know when you're connected"
 msgstr "拒绝向联系人授权。他人将无法知道您是否在线"
 
-#: ../src/gtkgui.glade.h:107
+#: ../src/gtkgui.glade.h:108
 msgid "Department:"
 msgstr "部门："
 
-#: ../src/gtkgui.glade.h:108
+#: ../src/gtkgui.glade.h:109
 msgid "Display avatars of contacts in roster"
 msgstr "显示名单中的联系人明细"
 
-#: ../src/gtkgui.glade.h:109
+#: ../src/gtkgui.glade.h:110
 msgid "Display status messages of contacts in roster"
 msgstr "显示名单中联系人的状态消息"
 
-#: ../src/gtkgui.glade.h:110
+#: ../src/gtkgui.glade.h:111
 msgid "E-Mail:"
 msgstr "E-Mail ："
 
-#: ../src/gtkgui.glade.h:111
+#: ../src/gtkgui.glade.h:112
 msgid "Edit Groups"
 msgstr "编辑群组"
 
-#: ../src/gtkgui.glade.h:112
+#: ../src/gtkgui.glade.h:113
 msgid "Edit Personal Information..."
 msgstr "编辑个人信息..."
 
-#: ../src/gtkgui.glade.h:113
+#: ../src/gtkgui.glade.h:114
 msgid "Edit _Groups"
 msgstr "编辑群组"
 
-#. XML Console enable checkbutton
 #: ../src/gtkgui.glade.h:115
+#, fuzzy
+msgid "Emoticon set:"
+msgstr "表情符管理"
+
+#. XML Console enable checkbutton
+#: ../src/gtkgui.glade.h:117
 msgid "Enable"
 msgstr "启用"
 
-#: ../src/gtkgui.glade.h:116
+#: ../src/gtkgui.glade.h:118
 msgid "Enter it again for confirmation:"
 msgstr "再次输入以确认："
 
-#: ../src/gtkgui.glade.h:117
+#: ../src/gtkgui.glade.h:119
 msgid "Enter new password:"
 msgstr "输入新密码"
 
-#: ../src/gtkgui.glade.h:118
+#: ../src/gtkgui.glade.h:120
 msgid "Events"
 msgstr "事件"
 
-#: ../src/gtkgui.glade.h:119
+#: ../src/gtkgui.glade.h:121
 msgid "Every 5 _minutes"
 msgstr "每 5 分钟(_M)"
 
-#: ../src/gtkgui.glade.h:120
+#: ../src/gtkgui.glade.h:122
 msgid "Extra Address:"
 msgstr "附加地址："
 
 #. Family Name
-#: ../src/gtkgui.glade.h:122
+#: ../src/gtkgui.glade.h:124
 msgid "Family:"
 msgstr "家族："
 
-#: ../src/gtkgui.glade.h:123
+#: ../src/gtkgui.glade.h:125
 msgid "File Transfers"
 msgstr "文件传输"
 
-#: ../src/gtkgui.glade.h:124
+#: ../src/gtkgui.glade.h:126
 msgid "File _Transfers"
 msgstr "文件传输(_T)"
 
-#: ../src/gtkgui.glade.h:125
+#: ../src/gtkgui.glade.h:127
 msgid "File manager:"
 msgstr "文件管理器："
 
-#: ../src/gtkgui.glade.h:126
+#: ../src/gtkgui.glade.h:128
 msgid "Filter:"
 msgstr "过滤器："
 
-#: ../src/gtkgui.glade.h:127
+#: ../src/gtkgui.glade.h:129
 msgid "Font style:"
 msgstr "字体风格："
 
-#: ../src/gtkgui.glade.h:128
+#: ../src/gtkgui.glade.h:130
 msgid "Font:"
 msgstr "字体："
 
-#: ../src/gtkgui.glade.h:129
+#: ../src/gtkgui.glade.h:131
 msgid "Forbid him/her to see my status"
 msgstr "禁止他人看到我的状态"
 
-#: ../src/gtkgui.glade.h:130
+#: ../src/gtkgui.glade.h:132
 msgid "Format: YYYY-MM-DD"
 msgstr "格式： YYYY-MM-DD"
 
-#: ../src/gtkgui.glade.h:131
+#: ../src/gtkgui.glade.h:133
 msgid "Frequently Asked Questions (online)"
 msgstr "被频繁提问的问题 (在线)"
 
-#: ../src/gtkgui.glade.h:132
+#: ../src/gtkgui.glade.h:134
 msgid "From:"
 msgstr "从："
 
-#: ../src/gtkgui.glade.h:133
+#: ../src/gtkgui.glade.h:135
 msgid "G_o"
 msgstr "到(_O)"
 
-#: ../src/gtkgui.glade.h:135
+#: ../src/gtkgui.glade.h:137
 msgid "Gajim Themes Customization"
 msgstr "Gajim 主题自定义"
 
-#: ../src/gtkgui.glade.h:136
-msgid "Gajim can send and receive meta-information related to a conversation you may have with a contact"
+#: ../src/gtkgui.glade.h:138
+msgid ""
+"Gajim can send and receive meta-information related to a conversation you "
+"may have with a contact"
 msgstr "Gajim 可以收发您与联系人所进行谈话的相关信息"
 
-#: ../src/gtkgui.glade.h:137
-msgid "Gajim will automatically show the new received message in a new chat window or tab in an existing chat window"
+#: ../src/gtkgui.glade.h:139
+msgid ""
+"Gajim will automatically show the new received message in a new chat window "
+"or tab in an existing chat window"
 msgstr "Gajim 会在已有的聊天窗口中打开新的窗口或标签以显示新抵达的消息"
 
-#: ../src/gtkgui.glade.h:138
-msgid "Gajim will notify you for new message via a popup in the bottom right of the screen"
+#: ../src/gtkgui.glade.h:140
+msgid ""
+"Gajim will notify you for new message via a popup in the bottom right of the "
+"screen"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示新消息"
 
-#: ../src/gtkgui.glade.h:139
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
+#: ../src/gtkgui.glade.h:141
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚登录的联系人"
 
-#: ../src/gtkgui.glade.h:140
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
+#: ../src/gtkgui.glade.h:142
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
 msgstr "Gajim 会通过屏幕右下方的弹出气泡提示刚刚离开的联系人"
 
-#: ../src/gtkgui.glade.h:141
-msgid "Gajim will only change the icon of the contact that sent the new message"
+#: ../src/gtkgui.glade.h:143
+msgid ""
+"Gajim will only change the icon of the contact that sent the new message"
 msgstr "Gajim 会改变发送了新消息的联系人的图标"
 
-#: ../src/gtkgui.glade.h:142
+#: ../src/gtkgui.glade.h:144
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim： 帐户创建向导"
 
+#: ../src/gtkgui.glade.h:145 ../src/roster_window.py:184
+msgid "General"
+msgstr "常规"
+
 #. Given Name
-#: ../src/gtkgui.glade.h:145
+#: ../src/gtkgui.glade.h:147
 msgid "Given:"
 msgstr "教名："
 
-#: ../src/gtkgui.glade.h:147
+#: ../src/gtkgui.glade.h:148
 msgid "Group:"
 msgstr "群组"
 
-#: ../src/gtkgui.glade.h:148
+#: ../src/gtkgui.glade.h:149
 msgid "HTTP Connect"
 msgstr "HTTP 连接"
 
-#: ../src/gtkgui.glade.h:149
+#: ../src/gtkgui.glade.h:150
 msgid "Help online"
 msgstr "在线帮助"
 
-#: ../src/gtkgui.glade.h:150
+#: ../src/gtkgui.glade.h:151
 msgid "Hides the window"
 msgstr "隐藏该窗口"
 
-#: ../src/gtkgui.glade.h:151
+#: ../src/gtkgui.glade.h:152
 msgid "Homepage:"
 msgstr "主页："
 
-#: ../src/gtkgui.glade.h:152
+#: ../src/gtkgui.glade.h:153
 msgid "Hostname: "
 msgstr "主机名："
 
-#: ../src/gtkgui.glade.h:153
+#: ../src/gtkgui.glade.h:154
 msgid "I already have an account I want to use"
 msgstr "我已经拥有了一个帐户"
 
-#: ../src/gtkgui.glade.h:154
+#: ../src/gtkgui.glade.h:155
 msgid "I want to _register for a new account"
 msgstr "我想注册一个新帐户(_R)"
 
-#: ../src/gtkgui.glade.h:155
+#: ../src/gtkgui.glade.h:156
 msgid "I would like to add you to my contact list."
 msgstr "我想添加您到我的联系人名单"
 
-#: ../src/gtkgui.glade.h:156
+#: ../src/gtkgui.glade.h:157
 msgid "If checked, Gajim will also have a trayicon"
 msgstr "如果选定，Gajim 同样可以显示系统托盘图标"
 
-#: ../src/gtkgui.glade.h:157
+#: ../src/gtkgui.glade.h:158
 msgid "If checked, Gajim will display avatars of contacts in roster window"
 msgstr "如果选定，Gajim 会在窗口中显示名单中的联系人明细"
 
-#: ../src/gtkgui.glade.h:158
-msgid "If checked, Gajim will display status messages of contacts under the contact name in roster window"
+#: ../src/gtkgui.glade.h:159
+msgid ""
+"If checked, Gajim will display status messages of contacts under the contact "
+"name in roster window"
 msgstr "如果选定，Gajim 会在窗口中联系人名下方显示联系人状态消息"
 
-#: ../src/gtkgui.glade.h:159
+#: ../src/gtkgui.glade.h:160
 msgid "If checked, Gajim will join this group chat on startup"
 msgstr "如果选定，Gajim 会在启动时加入聊天群组"
 
-#: ../src/gtkgui.glade.h:160
+#: ../src/gtkgui.glade.h:161
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "如果选定，Gajim 会记录本帐户密码"
 
-#: ../src/gtkgui.glade.h:161
-msgid "If checked, Gajim will remember the roster and chat window positions in the screen and the sizes of them next time you run it"
-msgstr "如果选定，Gajim 会在下次运行时使用本次设定的名单及聊天窗口的位置和大小"
-
 #: ../src/gtkgui.glade.h:162
-msgid "If checked, Gajim will replace ascii smilies like ':)' with equivalent graphical emoticons"
-msgstr "如果选定，Gajim 会相应的图片表情符替代字符表情,例如“:)”"
+msgid ""
+"If checked, Gajim will remember the roster and chat window positions in the "
+"screen and the sizes of them next time you run it"
+msgstr "如果选定，Gajim 会在下次运行时使用本次设定的名单及聊天窗口的位置和大小"
 
 #: ../src/gtkgui.glade.h:163
-msgid "If checked, Gajim will send keep-alive packets so it prevents connection timeout which results in disconnection"
-msgstr "如果选定，Gajim 会发送数据包防止超时造成的连接断开"
+msgid ""
+"If checked, Gajim will replace ascii smilies like ':)' with equivalent "
+"graphical emoticons"
+msgstr "如果选定，Gajim 会相应的图片表情符替代字符表情,例如“:)”"
 
 #: ../src/gtkgui.glade.h:164
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for you"
-msgstr "如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
+msgid ""
+"If checked, Gajim will send keep-alive packets so it prevents connection "
+"timeout which results in disconnection"
+msgstr "如果选定，Gajim 会发送数据包防止超时造成的连接断开"
 
 #: ../src/gtkgui.glade.h:165
-msgid "If checked, Gajim will use protocol-specific status icons. (eg. A contact from MSN will have the equivalent msn icon for status online, away, busy, etc...)"
-msgstr "如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同图标方式显示，以表示在线，离开，忙，等等...)"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for you"
+msgstr ""
+"如果选定，Gajim 会以已读许可方式为您个人把密码保存在 ~/.gajim/config 文件中"
 
 #: ../src/gtkgui.glade.h:166
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
+msgid ""
+"If checked, Gajim will use protocol-specific status icons. (eg. A contact "
+"from MSN will have the equivalent msn icon for status online, away, busy, "
+"etc...)"
+msgstr ""
+"如果选定，Gajim 会以协议特定方式显示状态图标。(例如，MSN 联系人会以 MSN 相同"
+"图标方式显示，以表示在线，离开，忙，等等...)"
 
 #: ../src/gtkgui.glade.h:167
-msgid "If checked, any change to the global status (handled by the combobox at the bottom of the roster window) will change the status of this account accordingly"
-msgstr "如果选定，改变全局状态(在名单窗口下方复选框中调节)就会相应地改变当前帐户的状态"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr "如果选定，Gajim 会在运行时使用本帐户自动连接 jabber"
 
 #: ../src/gtkgui.glade.h:168
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们就像属于同一个帐户"
+msgid ""
+"If checked, any change to the global status (handled by the combobox at the "
+"bottom of the roster window) will change the status of this account "
+"accordingly"
+msgstr ""
+"如果选定，改变全局状态(在名单窗口下方复选框中调节)就会相应地改变当前帐户的状"
+"态"
 
 #: ../src/gtkgui.glade.h:169
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+msgstr ""
+"如果选定，当您拥有多个帐户时，Gajim 会在列表中列出所有联系人，而看上去他们就"
+"像属于同一个帐户"
+
+#: ../src/gtkgui.glade.h:170
 msgid "Incoming message:"
 msgstr "消息抵达："
 
 #. Info/Query make the "IQ" initials. So translate like this 'YourLang/YourLang (Info/Query)'. Thanks (it's a tooltip so width is not a problem)
-#: ../src/gtkgui.glade.h:171
+#: ../src/gtkgui.glade.h:172
 msgid "Info/Query"
 msgstr "信息/查询"
 
-#: ../src/gtkgui.glade.h:172
+#: ../src/gtkgui.glade.h:173
 msgid "Information about you, as stored in the server"
 msgstr "服务器中保存的关于您的信息"
 
-#: ../src/gtkgui.glade.h:173
+#: ../src/gtkgui.glade.h:174
 msgid "Invitation Received"
 msgstr "收到邀请"
 
-#: ../src/gtkgui.glade.h:174
+#: ../src/gtkgui.glade.h:175
 msgid "Italic"
 msgstr "斜体"
 
-#: ../src/gtkgui.glade.h:175
+#: ../src/gtkgui.glade.h:176
 msgid "Jabber"
 msgstr "Jabber"
 
-#: ../src/gtkgui.glade.h:176
+#: ../src/gtkgui.glade.h:177
 msgid "Jabber ID:"
 msgstr "Jabber ID"
 
-#: ../src/gtkgui.glade.h:178
+#: ../src/gtkgui.glade.h:179
 msgid "Join _Group Chat"
 msgstr "加入群聊(_G)"
 
-#: ../src/gtkgui.glade.h:179
+#: ../src/gtkgui.glade.h:180
 msgid "Location"
 msgstr "定位"
 
-#: ../src/gtkgui.glade.h:180
+#: ../src/gtkgui.glade.h:181
 msgid "Manage Accounts"
 msgstr "帐户管理"
 
-#: ../src/gtkgui.glade.h:181
+#: ../src/gtkgui.glade.h:182
 msgid "Manage Bookmarks"
 msgstr "书签管理"
 
-#: ../src/gtkgui.glade.h:182
+#: ../src/gtkgui.glade.h:183
 msgid "Manage Emoticons"
 msgstr "表情符管理"
 
-#: ../src/gtkgui.glade.h:183
+#: ../src/gtkgui.glade.h:184
 msgid "Manage Proxy Profiles"
 msgstr "代理服务器模板管理"
 
-#: ../src/gtkgui.glade.h:184
+#: ../src/gtkgui.glade.h:185
 msgid "Manage..."
 msgstr "管理..."
 
 #. Middle Name
-#: ../src/gtkgui.glade.h:186
+#: ../src/gtkgui.glade.h:187
 msgid "Middle:"
 msgstr "中间："
 
-#: ../src/gtkgui.glade.h:187
+#: ../src/gtkgui.glade.h:188
 msgid "Mo_derator"
 msgstr "仲裁人(_D)"
 
-#: ../src/gtkgui.glade.h:188
+#: ../src/gtkgui.glade.h:189
 msgid "More"
 msgstr "更多"
 
-#: ../src/gtkgui.glade.h:189
+#: ../src/gtkgui.glade.h:190
 msgid "Name:"
 msgstr "名称："
 
-#: ../src/gtkgui.glade.h:190
+#: ../src/gtkgui.glade.h:191
+msgid ""
+"Never\n"
+"Always\n"
+"Per account\n"
+"Per type"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:195
 msgid "Nickname:"
 msgstr "昵称："
 
 #. None means no proxy profile selected
-#: ../src/gtkgui.glade.h:193
+#: ../src/gtkgui.glade.h:198
 msgid "None"
 msgstr "(æ— )"
 
-#: ../src/gtkgui.glade.h:194
+#: ../src/gtkgui.glade.h:199
 msgid "Notify me about contacts that: "
 msgstr "提醒我关于联系人："
 
-#: ../src/gtkgui.glade.h:195
+#: ../src/gtkgui.glade.h:200
+msgid "Notify on new _Gmail e-mail"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:201
 msgid "OS:"
 msgstr "操作系统："
 
-#: ../src/gtkgui.glade.h:196
+#: ../src/gtkgui.glade.h:202
 msgid "On every _message"
 msgstr "对于每条消息(_M)"
 
-#: ../src/gtkgui.glade.h:197
+#: ../src/gtkgui.glade.h:203
+#, fuzzy
+msgid "One message _window:"
+msgstr "发送消息并关闭窗口"
+
+#: ../src/gtkgui.glade.h:204
 msgid "Open..."
 msgstr "打开..."
 
-#: ../src/gtkgui.glade.h:198
-#: ../src/tabbed_chat_window.py:236
-msgid "OpenPGP Encryption"
-msgstr "OpenPGP 加密"
-
-#: ../src/gtkgui.Glade.h:199
+#: ../src/gtkgui.glade.h:206
 msgid "Or choose a preset message:"
 msgstr "或选择一条当前消息："
 
-#: ../src/gtkgui.glade.h:200
+#: ../src/gtkgui.glade.h:207
 msgid "Outgoing message:"
 msgstr "消息送出："
 
-#: ../src/gtkgui.glade.h:201
+#: ../src/gtkgui.glade.h:208
 msgid "Pass_word:"
 msgstr "密码(_W)"
 
-#: ../src/gtkgui.glade.h:203
+#: ../src/gtkgui.glade.h:210
 msgid "Password:"
 msgstr "密码："
 
-#: ../src/gtkgui.glade.h:204
+#: ../src/gtkgui.glade.h:211
 msgid "Personal Information"
 msgstr "个人信息"
 
-#: ../src/gtkgui.glade.h:205
+#: ../src/gtkgui.glade.h:212
 msgid "Phone No.:"
 msgstr "电话号码："
 
-#: ../src/gtkgui.glade.h:206
+#: ../src/gtkgui.glade.h:213
 msgid "Play _sounds"
 msgstr "播放声音(_S)"
 
-#: ../src/gtkgui.glade.h:207
+#: ../src/gtkgui.glade.h:214
 msgid "Port: "
 msgstr "端口："
 
-#: ../src/gtkgui.glade.h:208
+#: ../src/gtkgui.glade.h:215
 msgid "Position:"
 msgstr "位置："
 
-#: ../src/gtkgui.glade.h:209
+#: ../src/gtkgui.glade.h:216
 msgid "Postal Code:"
 msgstr "邮政编码："
 
-#: ../src/gtkgui.glade.h:210
+#: ../src/gtkgui.glade.h:217
 msgid "Preferences"
 msgstr "参数"
 
 #. Prefix in Name
-#: ../src/gtkgui.glade.h:212
+#: ../src/gtkgui.glade.h:219
 msgid "Prefix:"
 msgstr "前缀："
 
-#: ../src/gtkgui.glade.h:213
+#: ../src/gtkgui.glade.h:220
 msgid "Print time:"
 msgstr "显示时间："
 
-#: ../src/gtkgui.glade.h:214
+#: ../src/gtkgui.glade.h:221
 msgid "Priori_ty:"
 msgstr "优先级(_T):"
 
-#: ../src/gtkgui.glade.h:215
-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 "优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依据。"
+#: ../src/gtkgui.glade.h:222
+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 ""
+"优先级是当多个客户端使用同一帐户连接到服务器时， Jabber 决定事件响应对象的依"
+"据。"
 
-#: ../src/gtkgui.glade.h:216
+#: ../src/gtkgui.glade.h:223
 msgid "Profile, Avatar"
 msgstr "模板，明细"
 
-#: ../src/gtkgui.glade.h:217
+#: ../src/gtkgui.glade.h:224
 msgid "Protocol:"
 msgstr "协议："
 
-#: ../src/gtkgui.glade.h:218
+#: ../src/gtkgui.glade.h:225
 msgid "Proxy:"
 msgstr "代理服务器："
 
-#: ../src/gtkgui.glade.h:219
+#: ../src/gtkgui.glade.h:226
 msgid "Query Builder..."
 msgstr "查询生成器..."
 
-#: ../src/gtkgui.glade.h:220
+#: ../src/gtkgui.glade.h:227
 msgid "Recently:"
 msgstr "最近："
 
-#: ../src/gtkgui.glade.h:221
+#: ../src/gtkgui.glade.h:228
 msgid "Register to"
 msgstr "注册到"
 
-#: ../src/gtkgui.glade.h:222
+#: ../src/gtkgui.glade.h:229
 msgid "Remove account _only from Gajim"
 msgstr "仅从 Gajim 移除帐户(_O)"
 
-#: ../src/gtkgui.glade.h:223
+#: ../src/gtkgui.glade.h:230
 msgid "Remove account from Gajim and from _server"
 msgstr "同时从 Gajim 和服务器移除帐户(_S)"
 
-#: ../src/gtkgui.glade.h:224
+#: ../src/gtkgui.glade.h:231
 msgid "Remove file transfer from the list."
 msgstr "从列表移除文件传输"
 
-#: ../src/gtkgui.glade.h:225
+#: ../src/gtkgui.glade.h:232
 msgid "Removes completed, canceled and failed file transfers from the list"
 msgstr "从列表移除已完成，已取消和失败的文件传输"
 
-#: ../src/gtkgui.glade.h:226
-msgid "Removing selected file transfer"
-msgstr "正在移除指定的文件传输"
-
-#: ../src/gtkgui.glade.h:227
+#: ../src/gtkgui.glade.h:233
 msgid "Reply to this message"
 msgstr "回复本条消息"
 
-#: ../src/gtkgui.glade.h:228
+#: ../src/gtkgui.glade.h:234
 msgid "Reset to Default Colors"
 msgstr "恢复为默认颜色设置"
 
-#: ../src/gtkgui.glade.h:229
+#: ../src/gtkgui.glade.h:235
 msgid "Resour_ce: "
 msgstr "资源(_C)："
 
-#: ../src/gtkgui.glade.h:230
-msgid "Resource is sent to the Jabber server in order to separate the same JID in two or more parts depending on the number of the clients connected in the same server with the same account. So you might be connected in the same account with resource 'Home' and 'Work' at the same time. The resource which has the highest priority will get the events. (see below)"
-msgstr "资源被发往 Jabber 服务器后，通过同时连接到服务器的多个客户端将 JID 分成若干部分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得到服务器的事件响应。"
+#: ../src/gtkgui.glade.h:236
+msgid ""
+"Resource is sent to the Jabber server in order to separate the same JID in "
+"two or more parts depending on the number of the clients connected in the "
+"same server with the same account. So you might be connected in the same "
+"account with resource 'Home' and 'Work' at the same time. The resource which "
+"has the highest priority will get the events. (see below)"
+msgstr ""
+"资源被发往 Jabber 服务器后，通过同时连接到服务器的多个客户端将 JID 分成若干部"
+"分。您可以利用“家庭”和“工作”两个资源同时连接到服务器。拥有更高优先级的资源得"
+"到服务器的事件响应。"
 
-#: ../src/gtkgui.glade.h:231
+#: ../src/gtkgui.glade.h:237
 msgid "Resource:"
 msgstr "资源："
 
-#: ../src/gtkgui.glade.h:232
+#: ../src/gtkgui.glade.h:238
 msgid "Role:"
 msgstr "角色："
 
-#: ../src/gtkgui.glade.h:233
+#: ../src/gtkgui.glade.h:239
 msgid "Room Configuration"
 msgstr "房间设置："
 
-#: ../src/gtkgui.glade.h:234
+#: ../src/gtkgui.glade.h:240
 msgid "Room:"
 msgstr "房间："
 
-#: ../src/gtkgui.glade.h:235
+#: ../src/gtkgui.glade.h:241
 msgid "Save _passphrase (insecure)"
 msgstr "保存密文(_P)(不安全)"
 
-#: ../src/gtkgui.glade.h:236
+#: ../src/gtkgui.glade.h:242
 msgid "Save _position and size for roster and chat windows"
 msgstr "保存名单和聊天窗口的位置及大小(_P)"
 
-#: ../src/gtkgui.glade.h:237
+#: ../src/gtkgui.glade.h:243
 msgid "Save conversation _logs for all contacts"
 msgstr "保存与所有联系人的聊天记录(_L)"
 
-#: ../src/gtkgui.glade.h:238
+#: ../src/gtkgui.glade.h:244
 msgid "Save pass_word"
 msgstr "保存密码(_W)"
 
-#: ../src/gtkgui.glade.h:239
+#: ../src/gtkgui.glade.h:245
+#, fuzzy
+msgid "Search"
+msgstr "查找(_S)"
+
+#: ../src/gtkgui.glade.h:246
 msgid "Sen_d"
 msgstr "发送(_D)"
 
-#: ../src/gtkgui.glade.h:240
+#: ../src/gtkgui.glade.h:247
 msgid "Send File"
 msgstr "发送文件"
 
-#: ../src/gtkgui.glade.h:241
+#: ../src/gtkgui.glade.h:248
 msgid "Send Single _Message"
 msgstr "发送单条消息(_M)"
 
-#: ../src/gtkgui.glade.h:242
+#: ../src/gtkgui.glade.h:249
 msgid "Send _File"
 msgstr "发送文件(_F)"
 
-#: ../src/gtkgui.glade.h:243
+#: ../src/gtkgui.glade.h:250
 msgid "Send _New Message..."
 msgstr "发送新消息(_N)"
 
-#: ../src/gtkgui.glade.h:244
+#: ../src/gtkgui.glade.h:251
 msgid "Send keep-alive packets"
 msgstr "发送防超时数据包"
 
-#: ../src/gtkgui.glade.h:245
+#: ../src/gtkgui.glade.h:252
 msgid "Send message"
 msgstr "发送消息"
 
-#: ../src/gtkgui.glade.h:246
+#: ../src/gtkgui.glade.h:253
 msgid "Send message and close window"
 msgstr "发送消息并关闭窗口"
 
-#: ../src/gtkgui.glade.h:247
+#: ../src/gtkgui.glade.h:254
 msgid "Sends a message to currently connected users to this server"
 msgstr "发送消息至连接到当前服务器的用户"
 
-#: ../src/gtkgui.glade.h:248
+#: ../src/gtkgui.glade.h:255
 msgid "Server:"
 msgstr "服务器："
 
-#: ../src/gtkgui.glade.h:249
+#: ../src/gtkgui.glade.h:256
 msgid "Servers Features"
 msgstr "服务器设定"
 
-#: ../src/gtkgui.glade.h:250
+#: ../src/gtkgui.glade.h:257
 msgid "Set MOTD"
 msgstr "设定 MOTD"
 
-#: ../src/gtkgui.glade.h:251
+#: ../src/gtkgui.glade.h:258
 msgid "Set Message of the Day"
 msgstr "设定每日消息"
 
-#: ../src/gtkgui.glade.h:252
+#: ../src/gtkgui.glade.h:259
 msgid "Set _Avatar"
 msgstr "详细设置"
 
-#: ../src/gtkgui.glade.h:253
+#: ../src/gtkgui.glade.h:260
 msgid "Set an avatar when I connect"
 msgstr "连接时详细设置"
 
-#: ../src/gtkgui.glade.h:254
+#: ../src/gtkgui.glade.h:261
 msgid "Sets Message of the Day"
 msgstr "设定每日消息"
 
-#: ../src/gtkgui.glade.h:255
+#: ../src/gtkgui.glade.h:262
 msgid "Show All Pending _Events"
 msgstr "显示所有未决事件"
 
-#: ../src/gtkgui.glade.h:256
+#: ../src/gtkgui.glade.h:263
 msgid "Show _Offline Contacts"
 msgstr "显示离线联系人"
 
-#: ../src/gtkgui.glade.h:257
+#: ../src/gtkgui.glade.h:264
 msgid "Show _Roster"
 msgstr "显示名单(_R)"
 
-#: ../src/gtkgui.glade.h:258
+#: ../src/gtkgui.glade.h:265
 msgid "Show _XML Console"
 msgstr "显示 XML 控制台(_X)"
 
-#: ../src/gtkgui.glade.h:259
+#: ../src/gtkgui.glade.h:266
 msgid "Show only in _roster"
 msgstr "只显示名单中(_R)"
 
-#: ../src/gtkgui.glade.h:260
+#: ../src/gtkgui.glade.h:267
 msgid "Shows a list of file transfers between you and other"
 msgstr "显示文件传输列表"
 
-#: ../src/gtkgui.glade.h:261
+#: ../src/gtkgui.glade.h:268
 msgid "Sign _in"
 msgstr "登录(I)"
 
-#: ../src/gtkgui.glade.h:262
+#: ../src/gtkgui.glade.h:269
 msgid "Sign _out"
 msgstr "退出登录"
 
-#: ../src/gtkgui.glade.h:263
+#: ../src/gtkgui.glade.h:270
 msgid "Sort contacts by status"
 msgstr "按状态分类联系人"
 
-#: ../src/gtkgui.glade.h:264
+#: ../src/gtkgui.glade.h:271
 msgid "Sta_tus"
 msgstr "状态(_T)"
 
-#: ../src/gtkgui.glade.h:265
+#: ../src/gtkgui.glade.h:272
 msgid "Start _Chat"
 msgstr "开始群聊(_C)"
 
-#: ../src/gtkgui.glade.h:266
+#: ../src/gtkgui.glade.h:273
 msgid "State:"
 msgstr "州："
 
-#: ../src/gtkgui.glade.h:267
+#: ../src/gtkgui.glade.h:274
 msgid "Status"
 msgstr "状态"
 
-#: ../src/gtkgui.glade.h:268
+#: ../src/gtkgui.glade.h:275
 msgid "Status message:"
 msgstr "状态消息："
 
-#: ../src/gtkgui.glade.h:269
+#: ../src/gtkgui.glade.h:276
 msgid "Status:"
 msgstr "状态："
 
-#: ../src/gtkgui.glade.h:270
-msgid "Stoping selected file transfer"
-msgstr "中止选定的文件传输"
-
-#: ../src/gtkgui.glade.h:271
+#: ../src/gtkgui.glade.h:277
 msgid "Street:"
 msgstr "街道："
 
-#: ../src/gtkgui.glade.h:272
+#: ../src/gtkgui.glade.h:278
 msgid "Subject:"
 msgstr "主题："
 
-#: ../src/gtkgui.glade.h:273
+#: ../src/gtkgui.glade.h:279
 msgid "Subscription Request"
 msgstr "认证请求"
 
-#: ../src/gtkgui.glade.h:274
+#: ../src/gtkgui.glade.h:280
 msgid "Subscription:"
 msgstr "认证："
 
 #. Suffix in Name
-#: ../src/gtkgui.glade.h:276
+#: ../src/gtkgui.glade.h:282
 msgid "Suffix:"
 msgstr "后缀："
 
-#: ../src/gtkgui.glade.h:277
+#: ../src/gtkgui.glade.h:283
 msgid "Synch_ronize account status with global status"
 msgstr "将帐户状态与全局状态同步(_R)"
 
-#: ../src/gtkgui.glade.h:278
+#: ../src/gtkgui.glade.h:284
 msgid "Text _color:"
 msgstr "文本颜色(_C)："
 
-#: ../src/gtkgui.glade.h:279
+#: ../src/gtkgui.glade.h:285
 msgid "Text _font:"
 msgstr "文本字体(_F)："
 
-#: ../src/gtkgui.glade.h:280
+#: ../src/gtkgui.glade.h:286
 msgid "The auto away status message"
 msgstr "自动离开状态消息"
 
-#: ../src/gtkgui.glade.h:281
+#: ../src/gtkgui.glade.h:287
 msgid "The auto not available status message"
 msgstr "自动不可用状态消息"
 
-#: ../src/gtkgui.glade.h:282
+#: ../src/gtkgui.glade.h:288
 msgid "Theme:"
 msgstr "主题："
 
-#: ../src/gtkgui.glade.h:283
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
+#: ../src/gtkgui.glade.h:289
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
 msgstr "该操作会从列表中移除文件传输。如果该传输处于活动状态，将被先中止后移除"
 
-#: ../src/gtkgui.glade.h:284
+#: ../src/gtkgui.glade.h:290
 msgid "Title:"
 msgstr "标题："
 
-#: ../src/gtkgui.glade.h:285
+#: ../src/gtkgui.glade.h:291
 msgid "To:"
 msgstr "到："
 
-#: ../src/gtkgui.glade.h:286
+#: ../src/gtkgui.glade.h:292
 msgid "Toggle Open_PGP Encryption"
 msgstr "绑定 OpenPGP 加密 (_P)"
 
-#: ../src/gtkgui.glade.h:287
+#: ../src/gtkgui.glade.h:293
 msgid "Type your new status message:"
 msgstr "输入新的消息："
 
-#: ../src/gtkgui.glade.h:288
+#: ../src/gtkgui.glade.h:294
 msgid "Type:"
 msgstr "类型："
 
-#: ../src/gtkgui.glade.h:289
+#: ../src/gtkgui.glade.h:295
 msgid "URL:"
 msgstr "URL："
 
-#: ../src/gtkgui.glade.h:290
+#: ../src/gtkgui.glade.h:296
 msgid "Underline"
 msgstr "下划线"
 
-#: ../src/gtkgui.glade.h:291
+#: ../src/gtkgui.glade.h:297
 msgid "Update MOTD"
 msgstr "æ›´æ–° MOTD"
 
-#: ../src/gtkgui.glade.h:292
+#: ../src/gtkgui.glade.h:298
 msgid "Update Message of the Day"
 msgstr "更新每日消息"
 
-#: ../src/gtkgui.glade.h:293
+#: ../src/gtkgui.glade.h:299
 msgid "Updates Message of the Day"
 msgstr "更新每日消息"
 
-#: ../src/gtkgui.glade.h:294
+#: ../src/gtkgui.glade.h:300
 msgid "Use _SSL (legacy)"
 msgstr "使用 SSL(_S) (优先)"
 
-#: ../src/gtkgui.glade.h:295
+#: ../src/gtkgui.glade.h:301
 msgid "Use _emoticons"
 msgstr "使用表情符(_E)"
 
-#: ../src/gtkgui.glade.h:296
+#: ../src/gtkgui.glade.h:302
 msgid "Use _transports iconsets"
 msgstr "使用代理的图标设定(_T)"
 
-#: ../src/gtkgui.glade.h:297
-msgid "Use a single chat window with _tabs"
-msgstr "使用带标签的单个聊天窗口(_T)"
-
-#: ../src/gtkgui.glade.h:298
+#: ../src/gtkgui.glade.h:303
 msgid "Use authentication"
 msgstr "使用验证"
 
-#: ../src/gtkgui.glade.h:299
+#: ../src/gtkgui.glade.h:304
 msgid "Use custom hostname/port"
 msgstr "使用自定义主机名/端口号"
 
-#: ../src/gtkgui.glade.h:300
+#: ../src/gtkgui.glade.h:305
 msgid "User ID:"
 msgstr "用户 ID"
 
-#: ../src/gtkgui.glade.h:301
+#: ../src/gtkgui.glade.h:306
 msgid "When a file transfer is complete show a popup notification"
 msgstr "传输完成后显示弹出气泡提示"
 
-#: ../src/gtkgui.glade.h:302
-msgid "When a new event (message, file transfer request etc..) is received, the following methods may be used to inform you about it. NOTE: New message events only occur if it is a new message from a contact you are not already chatting with"
-msgstr "下列措施可以向您提示新事件的发生(消息，文件传输请求等..)。注意：来自未处于聊天中的联系人的消息，才会触发新事件"
+#: ../src/gtkgui.glade.h:307
+msgid ""
+"When a new event (message, file transfer request etc..) is received, the "
+"following methods may be used to inform you about it. NOTE: New message "
+"events only occur if it is a new message from a contact you are not already "
+"chatting with"
+msgstr ""
+"下列措施可以向您提示新事件的发生(消息，文件传输请求等..)。注意：来自未处于聊"
+"天中的联系人的消息，才会触发新事件"
 
-#: ../src/gtkgui.glade.h:303
+#: ../src/gtkgui.glade.h:308
 msgid "When new event is received"
 msgstr "当新事件发生时"
 
-#: ../src/gtkgui.glade.h:304
+#: ../src/gtkgui.glade.h:309
 msgid "Work"
 msgstr "工作"
 
-#: ../src/gtkgui.glade.h:305
+#: ../src/gtkgui.glade.h:310
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -2773,606 +2969,616 @@ msgstr ""
 "您需要一个帐户来连接\n"
 "Jabber 网络"
 
-#: ../src/gtkgui.glade.h:307
+#: ../src/gtkgui.glade.h:312
 msgid "Your JID:"
 msgstr "您的 JID："
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:309
+#. 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:314
 msgid "_Actions"
 msgstr "动作(_A)"
 
-#: ../src/gtkgui.glade.h:310
+#: ../src/gtkgui.glade.h:315
 msgid "_Add Contact..."
 msgstr "添加联系人(_A)..."
 
-#: ../src/gtkgui.glade.h:311
+#: ../src/gtkgui.glade.h:316
 msgid "_Add to Roster"
 msgstr "添加至名单(_A)"
 
-#: ../src/gtkgui.glade.h:312
+#: ../src/gtkgui.glade.h:317
 msgid "_Address:"
 msgstr "地址(_A):"
 
-#: ../src/gtkgui.glade.h:313
+#: ../src/gtkgui.glade.h:318
 msgid "_Admin"
 msgstr "管理(_A)"
 
-#: ../src/gtkgui.glade.h:314
+#: ../src/gtkgui.glade.h:319
 msgid "_Administrator"
 msgstr "管理员(_A)"
 
-#: ../src/gtkgui.glade.h:315
+#: ../src/gtkgui.glade.h:320
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: ../src/gtkgui.glade.h:316
+#: ../src/gtkgui.glade.h:321
 msgid "_Authorize"
 msgstr "授权(_A)"
 
-#: ../src/gtkgui.glade.h:317
+#: ../src/gtkgui.glade.h:322
 msgid "_Background:"
 msgstr "背景(_B)"
 
-#: ../src/gtkgui.glade.h:318
+#: ../src/gtkgui.glade.h:323
 msgid "_Ban"
 msgstr "封禁(_B)"
 
-#: ../src/gtkgui.glade.h:319
+#: ../src/gtkgui.glade.h:324
 msgid "_Bookmark This Room"
 msgstr "将本房间加入书签(_B)"
 
-#: ../src/gtkgui.glade.h:320
+#: ../src/gtkgui.glade.h:325
 msgid "_Browser:"
 msgstr "浏览器(_B)："
 
-#: ../src/gtkgui.glade.h:321
+#: ../src/gtkgui.glade.h:326
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../src/gtkgui.glade.h:322
+#: ../src/gtkgui.glade.h:327
 msgid "_Compact View    Alt+C"
 msgstr "紧凑模式(_C)  Alt+C"
 
-#: ../src/gtkgui.glade.h:323
+#: ../src/gtkgui.glade.h:328
 msgid "_Contents"
 msgstr "内容(_C)"
 
-#: ../src/gtkgui.glade.h:325
+#: ../src/gtkgui.glade.h:330
 msgid "_Copy JID/Email Address"
 msgstr "复制 JID/电子邮件地址(_C)"
 
-#: ../src/gtkgui.glade.h:326
+#: ../src/gtkgui.glade.h:331
 msgid "_Copy Link Location"
 msgstr "复制连接位置(_C)"
 
-#: ../src/gtkgui.glade.h:327
+#: ../src/gtkgui.glade.h:332
 msgid "_Deny"
 msgstr "拒绝(_D)"
 
-#: ../src/gtkgui.glade.h:328
+#: ../src/gtkgui.glade.h:333
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
-#: ../src/gtkgui.glade.h:329
+#: ../src/gtkgui.glade.h:334
 msgid "_Discover Services..."
 msgstr "发掘服务(_D)..."
 
-#: ../src/gtkgui.glade.h:331
+#: ../src/gtkgui.glade.h:336
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../src/gtkgui.glade.h:332
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "过滤器(_F):"
 
-#: ../src/gtkgui.glade.h:333
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:339
 msgid "_Group Chat"
 msgstr "群聊(_G)"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:340
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:341
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:342
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:343
 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:340
+#: ../src/gtkgui.glade.h:345
 msgid "_IQ"
 msgstr "IQ(_I)"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:346
 msgid "_Icon in systray (aka. notification area)"
 msgstr "系统托盘图标(_I)"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:348
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:350
 msgid "_Join New Room..."
 msgstr "加入新房间(_J)..."
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "踢除(_K)"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:352
 msgid "_Log conversation history"
 msgstr "记录聊天历史(_L)"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:353
 msgid "_Log status changes of contacts"
 msgstr "记录联系人状态变化(_L)"
 
-#: ../src/gtkgui.glade.h:349
+#: ../src/gtkgui.glade.h:354
 msgid "_Mail client:"
 msgstr "邮件客户端(_M)："
 
-#: ../src/gtkgui.glade.h:350
+#: ../src/gtkgui.glade.h:355
 msgid "_Member"
 msgstr "成员(_M)"
 
-#: ../src/gtkgui.glade.h:351
+#: ../src/gtkgui.glade.h:356
 msgid "_Merge accounts"
 msgstr "合并帐户(_M)"
 
-#: ../src/gtkgui.glade.h:352
+#: ../src/gtkgui.glade.h:357
 msgid "_Message"
 msgstr "消息(_M)"
 
-#: ../src/gtkgui.glade.h:353
+#: ../src/gtkgui.glade.h:358
 msgid "_Modify"
 msgstr "修改(_M)"
 
-#: ../src/gtkgui.glade.h:354
+#: ../src/gtkgui.glade.h:359
 msgid "_Modify Account..."
 msgstr "修改帐户(_M)..."
 
-#: ../src/gtkgui.glade.h:355
+#: ../src/gtkgui.glade.h:360
 msgid "_Name: "
 msgstr "名称(_N)："
 
-#: ../src/gtkgui.glade.h:356
+#: ../src/gtkgui.glade.h:361
 msgid "_Never"
 msgstr "从不(_N)"
 
-#: ../src/gtkgui.glade.h:357
+#: ../src/gtkgui.glade.h:362
 msgid "_Notify me about it"
 msgstr "提醒我(_N)"
 
-#: ../src/gtkgui.glade.h:358
+#: ../src/gtkgui.glade.h:363
 msgid "_Notify me when a file transfer is complete"
 msgstr "文件传输完成时提醒我(_N)"
 
-#: ../src/gtkgui.glade.h:359
+#: ../src/gtkgui.glade.h:364
 msgid "_OK"
 msgstr "确定(_O)"
 
-#: ../src/gtkgui.glade.h:360
+#: ../src/gtkgui.glade.h:365
 msgid "_Occupant Actions"
 msgstr "房主动作(_O)"
 
-#: ../src/gtkgui.glade.h:361
+#: ../src/gtkgui.glade.h:366
 msgid "_Online Users"
 msgstr "在线用户(_O)"
 
-#: ../src/gtkgui.glade.h:363
+#: ../src/gtkgui.glade.h:368
 msgid "_Open Email Composer"
 msgstr "打开邮件编辑器(_O)"
 
-#: ../src/gtkgui.glade.h:364
+#: ../src/gtkgui.glade.h:369
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开连接(_O)"
 
-#: ../src/gtkgui.glade.h:365
+#: ../src/gtkgui.glade.h:370
 msgid "_Owner"
 msgstr "拥有人(_O)"
 
-#: ../src/gtkgui.glade.h:366
+#: ../src/gtkgui.glade.h:371
 msgid "_Password:"
 msgstr "密码(_P)："
 
-#: ../src/gtkgui.glade.h:367
+#: ../src/gtkgui.glade.h:372
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: ../src/gtkgui.glade.h:368
+#: ../src/gtkgui.glade.h:373
 msgid "_Player:"
 msgstr "参与者(_P)"
 
-#: ../src/gtkgui.glade.h:369
+#: ../src/gtkgui.glade.h:374
 msgid "_Pop it up"
 msgstr "弹出(_P)"
 
-#: ../src/gtkgui.glade.h:370
+#: ../src/gtkgui.glade.h:375
 msgid "_Port:"
 msgstr "端口(_P)"
 
-#: ../src/gtkgui.glade.h:371
+#: ../src/gtkgui.glade.h:376
 msgid "_Preferences"
 msgstr "首选项(_P)"
 
-#: ../src/gtkgui.glade.h:372
+#: ../src/gtkgui.glade.h:377
 msgid "_Presence"
 msgstr "在场(_P)"
 
-#: ../src/gtkgui.glade.h:373
+#: ../src/gtkgui.glade.h:378
 msgid "_Publish"
 msgstr "发布(_P)"
 
-#: ../src/gtkgui.glade.h:374
+#: ../src/gtkgui.glade.h:379
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#: ../src/gtkgui.glade.h:375
+#: ../src/gtkgui.glade.h:380
 msgid "_Remove"
 msgstr "移除(_R)"
 
-#: ../src/gtkgui.glade.h:376
-#: ../src/roster_window.py:1081
+#: ../src/gtkgui.glade.h:381 ../src/roster_window.py:1108
 msgid "_Remove from Roster"
 msgstr "从名单中移除(_R)"
 
-#: ../src/gtkgui.glade.h:377
+#: ../src/gtkgui.glade.h:382
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: ../src/gtkgui.glade.h:378
+#: ../src/gtkgui.glade.h:383
 msgid "_Reply"
 msgstr "回复(_R)"
 
-#: ../src/gtkgui.glade.h:379
+#: ../src/gtkgui.glade.h:384
 msgid "_Retrieve"
 msgstr "找回(_R)"
 
-#: ../src/gtkgui.glade.h:380
+#: ../src/gtkgui.glade.h:385
 msgid "_Search"
 msgstr "查找(_S)"
 
-#. Make sure the character after "_" is not E/e (conflicts with Alt+E that is supposed to show the Emoticon Selector)
-#: ../src/gtkgui.glade.h:382
+#. 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:387
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../src/gtkgui.glade.h:383
+#: ../src/gtkgui.glade.h:388
 msgid "_Send & Close"
 msgstr "发送并关闭(_S)"
 
-#: ../src/gtkgui.glade.h:384
+#: ../src/gtkgui.glade.h:389
 msgid "_Send Private Message"
 msgstr "发送私聊消息(_S)"
 
-#: ../src/gtkgui.glade.h:385
+#: ../src/gtkgui.glade.h:390
 msgid "_Send Server Message"
 msgstr "发送服务器消息(_S)"
 
-#: ../src/gtkgui.glade.h:386
+#: ../src/gtkgui.glade.h:391
 msgid "_Send Single Message"
 msgstr "发送单条消息(_S)"
 
-#: ../src/gtkgui.glade.h:387
+#: ../src/gtkgui.glade.h:392
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: ../src/gtkgui.glade.h:388
+#: ../src/gtkgui.glade.h:393
 msgid "_Set Image..."
 msgstr "选择形象(_S)..."
 
-#: ../src/gtkgui.glade.h:389
+#: ../src/gtkgui.glade.h:394
 msgid "_Start Chat"
 msgstr "开始聊天(_S)"
 
-#: ../src/gtkgui.glade.h:390
+#: ../src/gtkgui.glade.h:395
 msgid "_Status"
 msgstr "状态(_S)"
 
-#: ../src/gtkgui.glade.h:391
+#: ../src/gtkgui.glade.h:396
 msgid "_Subscribe"
 msgstr "认证(_S)"
 
-#: ../src/gtkgui.glade.h:392
+#: ../src/gtkgui.glade.h:397
 msgid "_Subscription"
 msgstr "认证(_S)"
 
-#: ../src/gtkgui.glade.h:393
+#: ../src/gtkgui.glade.h:398
 msgid "_Use proxy"
 msgstr "使用代理服务器(_U)"
 
-#: ../src/gtkgui.glade.h:394
+#: ../src/gtkgui.glade.h:399
 msgid "_Username:"
 msgstr "用户名(_U)："
 
-#: ../src/gtkgui.glade.h:395
+#: ../src/gtkgui.glade.h:400
 msgid "_Voice"
 msgstr "语音(_V)"
 
-#: ../src/gtkgui.glade.h:396
+#: ../src/gtkgui.glade.h:401
 msgid "_XML Console..."
 msgstr "XML 控制(_X)..."
 
-#: ../src/gtkgui.glade.h:397
+#: ../src/gtkgui.glade.h:402
 msgid "file transfers list"
 msgstr "文件传输列表"
 
-#: ../src/gtkgui.glade.h:398
+#: ../src/gtkgui.glade.h:403
 msgid "minutes"
 msgstr "分钟"
 
 #. we talk about file
-#: ../src/gtkgui_helpers.py:105
-#: ../src/gtkgui_helpers.py:120
+#: ../src/gtkgui_helpers.py:105 ../src/gtkgui_helpers.py:120
 #, python-format
 msgid "Error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/gtkgui_helpers.py:259
+#: ../src/gtkgui_helpers.py:253
 msgid "Error reading file:"
 msgstr "读文件错误："
 
-#: ../src/gtkgui_helpers.py:262
+#: ../src/gtkgui_helpers.py:256
 msgid "Error parsing file:"
 msgstr "分析文件错误："
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:299
+#: ../src/gtkgui_helpers.py:294
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr "不能写入到 %s 。会话管理支持功能未启用"
 
-#: ../src/history_window.py:93
+#: ../src/history_window.py:94
 msgid "Date"
 msgstr "日期"
 
-#: ../src/history_window.py:101
+#: ../src/history_window.py:102
 msgid "Message"
 msgstr "消息"
 
-#: ../src/history_window.py:110
-#: ../src/history_window.py:112
+#: ../src/history_window.py:111 ../src/history_window.py:113
 #, python-format
 msgid "Conversation History with %s"
 msgstr "与 %s 的聊天历史"
 
-#: ../src/history_window.py:258
+#: ../src/history_window.py:262
 #, python-format
 msgid "%(nick)s is now %(status)s: %(status_msg)s"
 msgstr "%(nick)s 的状态是 %(status)s: %(status_msg)s"
 
-#: ../src/history_window.py:262
+#: ../src/history_window.py:266
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s 的状态是 %(status)s"
 
-#: ../src/history_window.py:268
+#: ../src/history_window.py:272
 #, python-format
 msgid "Status is now: %(status)s: %(status_msg)s"
 msgstr "现在状态：%(status)s：%(status_msg)s"
 
-#: ../src/history_window.py:271
+#: ../src/history_window.py:275
 #, python-format
 msgid "Status is now: %(status)s"
 msgstr "现在状态： %(status)s "
 
-#: ../src/notify.py:127
+#: ../src/message_window.py:398
+#, python-format
+msgid "Switch to %s"
+msgstr "切换到 %s"
+
+#: ../src/notify.py:145
 #, python-format
 msgid "%(nickname)s in room %(room_name)s has sent you a new message."
 msgstr "房间 %(room_name)s 的 %(nickname)s 向您发送了一条新消息。"
 
 #. we talk about a name here
-#: ../src/notify.py:132
+#: ../src/notify.py:150
 #, python-format
 msgid "%s has sent you a new message."
 msgstr "%s 给您发送了一条新消息。"
 
 #. we talk about a name here
-#: ../src/notify.py:141
+#: ../src/notify.py:159
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s 想发送给您一个文件。"
 
-#: ../src/notify.py:155
+#: ../src/notify.py:173
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "你成功的从 %(name)s 收到文件  %(filename)s。"
 
 #. ft stopped
-#: ../src/notify.py:159
+#: ../src/notify.py:177
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "从 %(name)s 传输的文件 %(filename)s 被停止。"
 
-#: ../src/notify.py:172
+#: ../src/notify.py:190
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "您成功的给 %(name)s 发送了文件 %(filename)s。"
 
 #. ft stopped
-#: ../src/notify.py:176
+#: ../src/notify.py:194
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "到 %(name)s 的文件传输 %(filename)s 被停止。"
 
-#: ../src/roster_window.py:122
+#: ../src/roster_window.py:128
 msgid "Merged accounts"
 msgstr "已合并的帐户"
 
-#: ../src/roster_window.py:317
+#: ../src/roster_window.py:182
+#, fuzzy
+msgid "Observers"
+msgstr "服务器"
+
+#: ../src/roster_window.py:338
 #, python-format
 msgid "You are already in room %s"
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/roster_window.py:322
-#: ../src/roster_window.py:1790
+#: ../src/roster_window.py:343 ../src/roster_window.py:1828
 msgid "You cannot join a room while you are invisible"
 msgstr "隐身时无法加入房间。"
 
-#: ../src/roster_window.py:475
+#: ../src/roster_window.py:498
 msgid "_Join New Room"
 msgstr "加入新房间(_J)"
 
-#: ../src/roster_window.py:490
+#: ../src/roster_window.py:513
 msgid "Manage Bookmarks..."
 msgstr "书签管理..."
 
-#: ../src/roster_window.py:505
+#: ../src/roster_window.py:528
 #, python-format
 msgid "to %s account"
 msgstr "至帐户 %s"
 
-#: ../src/roster_window.py:517
+#: ../src/roster_window.py:540
 #, python-format
 msgid "using %s account"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:531
+#: ../src/roster_window.py:554
 #, python-format
 msgid "using account %s"
 msgstr "使用账户 %s"
 
-#: ../src/roster_window.py:542
+#: ../src/roster_window.py:565
 #, python-format
 msgid "for account %s"
 msgstr "为帐户 %s"
 
-#: ../src/roster_window.py:834
+#: ../src/roster_window.py:859
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "代理“%s”将被移除"
 
-#: ../src/roster_window.py:834
-msgid "You will no longer be able to send and receive messages to contacts from this transport."
+#: ../src/roster_window.py:859
+msgid ""
+"You will no longer be able to send and receive messages to contacts from "
+"this transport."
 msgstr "您将无法从此代理收发消息。"
 
-#: ../src/roster_window.py:884
+#: ../src/roster_window.py:911
 msgid "Assign OpenPGP Key"
 msgstr "指定您的 OpenPGP 钥匙"
 
-#: ../src/roster_window.py:885
+#: ../src/roster_window.py:912
 msgid "Select a key to apply to the contact"
 msgstr "选择一个键应用于联系人。"
 
-#: ../src/roster_window.py:1000
+#: ../src/roster_window.py:1027
 msgid "I would like to add you to my roster"
 msgstr "我想加您为好友"
 
-#: ../src/roster_window.py:1033
+#: ../src/roster_window.py:1060
 msgid "Re_name"
 msgstr "重命名(_N)"
 
-#: ../src/roster_window.py:1054
+#: ../src/roster_window.py:1081
 msgid "_Log on"
 msgstr "登入(_L)"
 
-#: ../src/roster_window.py:1063
+#: ../src/roster_window.py:1090
 msgid "Log _off"
 msgstr "退出登录(_O)"
 
-#: ../src/roster_window.py:1157
+#: ../src/roster_window.py:1184
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:1228
+#: ../src/roster_window.py:1255
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1229
+#: ../src/roster_window.py:1256
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1251
+#: ../src/roster_window.py:1278
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1252
+#: ../src/roster_window.py:1279
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1262
+#: ../src/roster_window.py:1290
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1263
+#: ../src/roster_window.py:1291
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1407
+#: ../src/roster_window.py:1438
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:1408
-msgid "By removing this contact you also by default remove authorization resulting in him or her always seeing you as offline."
+#: ../src/roster_window.py:1440
+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:1409
+#: ../src/roster_window.py:1441
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: ../src/roster_window.py:1490
+#: ../src/roster_window.py:1522
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/roster_window.py:1491
+#: ../src/roster_window.py:1523
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "为账户 %s 输入 GPG 密文"
 
-#: ../src/roster_window.py:1492
+#: ../src/roster_window.py:1524
 msgid "Save passphrase"
 msgstr "保存密文"
 
-#: ../src/roster_window.py:1535
-#: ../src/roster_window.py:1595
+#: ../src/roster_window.py:1567 ../src/roster_window.py:1627
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:1536
-#: ../src/roster_window.py:1596
-msgid "Changing your status to invisible will result in disconnection from those group chats. Are you sure you want to go invisible?"
+#: ../src/roster_window.py:1568 ../src/roster_window.py:1628
+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:1555
+#: ../src/roster_window.py:1587
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:1556
+#: ../src/roster_window.py:1588
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:1949
-#: ../src/roster_window.py:1955
+#: ../src/roster_window.py:1987 ../src/roster_window.py:1993
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:1950
-#: ../src/roster_window.py:1956
-msgid "Messages will only be available for reading them later if you have history enabled."
+#: ../src/roster_window.py:1988 ../src/roster_window.py:1994
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:2636
+#: ../src/roster_window.py:2704
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
@@ -3382,8 +3588,7 @@ msgstr "更改状态消息_(C)..."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:183
-#: ../src/systray.py:188
+#: ../src/systray.py:183 ../src/systray.py:188
 msgid "using account "
 msgstr "使用帐户"
 
@@ -3391,97 +3596,54 @@ msgstr "使用帐户"
 msgid "Hide this menu"
 msgstr "隐藏本菜单"
 
-#: ../src/systray.py:270
+#: ../src/systray.py:271
 msgid "All contacts in this group are offline or have errors"
 msgstr "该组中所有联系人离线或有错误"
 
-#: ../src/systraywin32.py:278
-#: ../src/systraywin32.py:297
-#: ../src/tooltips.py:267
+#: ../src/systraywin32.py:278 ../src/systraywin32.py:297
+#: ../src/tooltips.py:266
+#, python-format
 msgid "Gajim - %d unread message"
-msgid_plural "Gajim - %d unread  messages"
+msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - %d 条未读消息 "
 
-#. we talk about a contact here
-#: ../src/tabbed_chat_window.py:240
-#, python-format
-msgid "%s has not broadcasted an OpenPGP key nor you have assigned one"
-msgstr "%s 没有广播 OpenPGP 密钥或您未指定"
-
-#. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:406
-#: ../src/tabbed_chat_window.py:462
-#, python-format
-msgid "You just received a new message from \"%s\""
-msgstr "收到一条来自 “%s” 的消息"
-
-#: ../src/tabbed_chat_window.py:407
-msgid "If you close this tab and you have history disabled, this message will be lost."
-msgstr "如果您关闭此标签并且禁用历史，此消息会丢失。"
-
-#: ../src/tabbed_chat_window.py:463
-msgid "If you close this tab and you have history disabled, the message will be lost."
-msgstr "如果您关闭此标签并且禁用历史，消息会丢失。"
-
-#: ../src/tabbed_chat_window.py:755
-msgid "Sending private message failed"
-msgstr "发送私有消息失败"
-
-#. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:757
-#, python-format
-msgid "You are no longer in room \"%s\" or \"%s\" has left."
-msgstr "您不再在房间“%s”中或“%s”已离开。"
-
-#: ../src/tabbed_chat_window.py:899
-msgid "Encryption enabled"
-msgstr "启用加密"
-
-#: ../src/tabbed_chat_window.py:904
-msgid "Encryption disabled"
-msgstr "禁用加密"
-
-#: ../src/tooltips.py:273
+#: ../src/tooltips.py:272
 #, python-format
 msgid "Gajim - %d unread single message"
 msgid_plural "Gajim - %d unread single messages"
 msgstr[0] "Gajim - %d 条未读消息"
 
-#: ../src/tooltips.py:279
+#: ../src/tooltips.py:278
 #, python-format
 msgid "Gajim - %d unread group chat message"
 msgid_plural "Gajim - %d unread group chat messages"
 msgstr[0] "Gajim - %d 条未读群聊消息"
 
-#: ../src/tooltips.py:285
+#: ../src/tooltips.py:284
 #, python-format
 msgid "Gajim - %d unread private message"
 msgid_plural "Gajim - %d unread private messages"
 msgstr[0] "Gajim - %d 未读私人消息"
 
-#: ../src/tooltips.py:300
-#: ../src/tooltips.py:302
+#: ../src/tooltips.py:299 ../src/tooltips.py:301
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:329
 msgid "Role: "
 msgstr "角色："
 
-#: ../src/tooltips.py:333
+#: ../src/tooltips.py:332
 msgid "Affiliation: "
 msgstr "会籍："
 
-#: ../src/tooltips.py:336
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:444
+#: ../src/tooltips.py:335 ../src/tooltips.py:430 ../src/tooltips.py:444
 #: ../src/tooltips.py:508
 msgid "Status: "
 msgstr "状态"
 
-#: ../src/tooltips.py:346
-#: ../src/tooltips.py:440
+#: ../src/tooltips.py:345 ../src/tooltips.py:440
 msgid "Resource: "
 msgstr "资源："
 
@@ -3513,8 +3675,7 @@ msgstr "大小："
 msgid "Transferred: "
 msgstr "已传输："
 
-#: ../src/tooltips.py:511
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:511 ../src/tooltips.py:532
 msgid "Not started"
 msgstr "未开始"
 
@@ -3522,8 +3683,7 @@ msgstr "未开始"
 msgid "Stopped"
 msgstr "已停止"
 
-#: ../src/tooltips.py:517
-#: ../src/tooltips.py:520
+#: ../src/tooltips.py:517 ../src/tooltips.py:520
 msgid "Completed"
 msgstr "已完成"
 
@@ -3558,342 +3718,415 @@ msgstr "选择明细"
 
 #. in bytes
 #. 32 kb
-#: ../src/vcard.py:210
+#: ../src/vcard.py:206
 #, python-format
 msgid "The filesize of image \"%s\" is too large"
 msgstr "图像文件 “%s” 太大"
 
-#: ../src/vcard.py:212
+#: ../src/vcard.py:208
 msgid "The file must not be more than 32 kilobytes."
 msgstr "文件必须小于 32 kB 。"
 
-#: ../src/vcard.py:278
+#: ../src/vcard.py:274
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:280
+#: ../src/vcard.py:276
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:292
-msgid "This contact is interested in your presence information, but you are not interested in his/her presence"
+#: ../src/vcard.py:289
+msgid ""
+"This contact is interested in your presence information, but you are not "
+"interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:294
-msgid "You are interested in the contact's presence information, but he/she is not interested in yours"
+#: ../src/vcard.py:291
+msgid ""
+"You are interested in the contact's presence information, but he/she is not "
+"interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:296
+#: ../src/vcard.py:293
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:298
-msgid "You are not interested in the contact's presence, and neither he/she is interested in yours"
+#: ../src/vcard.py:295
+msgid ""
+"You are not interested in the contact's presence, and neither he/she is "
+"interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:307
+#: ../src/vcard.py:304
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:319
-#: ../src/vcard.py:338
+#: ../src/vcard.py:316 ../src/vcard.py:336
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#: ../src/vcard.py:421
+#: ../src/vcard.py:419
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/vcard.py:450
+#: ../src/vcard.py:448
 msgid "Without a connection, you can not get your contact information."
 msgstr "无法脱机获取个人信息。"
 
+#: ../src/vcard.py:452
+#, fuzzy
+msgid "Personal details"
+msgstr "个人信息"
+
 #: ../src/common/check_paths.py:39
 msgid "creating logs database"
 msgstr "建立日志数据库"
 
-#: ../src/common/check_paths.py:79
-#: ../src/common/check_paths.py:91
+#: ../src/common/check_paths.py:80 ../src/common/check_paths.py:92
+#: ../src/common/check_paths.py:100
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s 应为文件但它应为一个目录"
 
-#: ../src/common/check_paths.py:80
-#: ../src/common/check_paths.py:92
-#: ../src/common/check_paths.py:99
+#: ../src/common/check_paths.py:81 ../src/common/check_paths.py:93
+#: ../src/common/check_paths.py:101 ../src/common/check_paths.py:108
 msgid "Gajim will now exit"
 msgstr "Gajim 即将退出"
 
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/check_paths.py:88
-#: ../src/common/check_paths.py:104
-#: ../src/common/check_paths.py:107
+#: ../src/common/check_paths.py:89 ../src/common/check_paths.py:97
+#: ../src/common/check_paths.py:113 ../src/common/check_paths.py:116
 #, python-format
 msgid "creating %s directory"
 msgstr "正在建立 %s 目录"
 
-#: ../src/common/check_paths.py:98
+#: ../src/common/check_paths.py:107
 #, python-format
 msgid "%s is directory but should be file"
 msgstr "%s 应为文件但它是一个目录"
 
 #: ../src/common/exceptions.py:35
-msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install pysqlite3, if you want to migrate your logs to the new database, please read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
-msgstr "pysqlite2 (即 python-pysqlite2) 依赖丢失。在您安装 pysqlite3 后，如果您想移动日志到新的数据库，请参阅：http://trac.gajim.org/wiki/MigrateLogToDot9DB 退出..."
+msgid "pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting..."
+msgstr ""
 
-#: ../src/common/exceptions.py:46
+#: ../src/common/exceptions.py:43
 msgid "Service not available: Gajim is not running, or remote_control is False"
 msgstr "服务不可用：Gajim不在运行，或远程控制错误"
 
-#: ../src/common/exceptions.py:54
+#: ../src/common/exceptions.py:51
 msgid "D-Bus is not present on this machine or python module is missing"
 msgstr "D-Bus 在此机器上不可用或 Python 模块缺失"
 
-#: ../src/common/exceptions.py:62
+#: ../src/common/exceptions.py:59
 msgid "Session bus is not available"
 msgstr "会话总线不可用"
 
-#: ../src/common/config.py:54
+#: ../src/common/config.py:58
 msgid "Use DBus and Notification-Daemon to show notifications"
 msgstr "使用 D-Bus 和通知进程显示通知"
 
-#: ../src/common/config.py:58
+#: ../src/common/config.py:62
 msgid "Time in minutes, after which your status changes to away."
 msgstr "转换状态为“离开”之前的时间(分钟)。"
 
-#: ../src/common/config.py:59
+#: ../src/common/config.py:63
 msgid "Away as a result of being idle"
 msgstr "发呆导致的离开"
 
-#: ../src/common/config.py:61
+#: ../src/common/config.py:65
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "转换状态为“不可用”之前的时间(分钟)"
 
-#: ../src/common/config.py:62
+#: ../src/common/config.py:66
 msgid "Not available as a result of being idle"
 msgstr "发呆导致的不可用"
 
-#: ../src/common/config.py:89
-msgid "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
+#: ../src/common/config.py:92
+msgid ""
+"If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr "如果为真，不要移除 */_。所以 *abc* 将被加粗但 * * 不会被移除"
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:133
 msgid "Add * and [n] in roster title?"
 msgstr "加入 * 和 [n] 在名单标题？"
 
-#: ../src/common/config.py:126
-msgid "How many lines to remember from previous conversation when a chat tab/window is reopened."
+#: ../src/common/config.py:134
+msgid ""
+"How many lines to remember from previous conversation when a chat tab/window "
+"is reopened."
 msgstr "聊天标签/窗口被重新打开时显示的历史谈话行数"
 
-#: ../src/common/config.py:127
+#: ../src/common/config.py:135
 msgid "How many minutes should last lines from previous conversation last."
 msgstr "距上次谈话结束的分钟数"
 
-#: ../src/common/config.py:128
-msgid "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ Client default behaviour)."
+#: ../src/common/config.py:136
+msgid ""
+"Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
+"Client default behaviour)."
 msgstr "用 Ctrl+回车 发行消息，回车开始新行(紫茉莉 ICQ 客户端默认操作)。"
 
-#: ../src/common/config.py:130
+#: ../src/common/config.py:138
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Ctrl+上箭头 存储行数。"
 
 #. which version created the config
-#: ../src/common/config.py:132
+#: ../src/common/config.py:140
 msgid "Use compact view when you open a chat window"
 msgstr "开启新聊天窗口时使用紧凑模式"
 
-#: ../src/common/config.py:133
+#: ../src/common/config.py:141
 msgid "Use compact view when you open a group chat window"
 msgstr "开启新群聊窗口时使用紧凑模式"
 
-#: ../src/common/config.py:135
+#: ../src/common/config.py:143
 #, python-format
-msgid "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' which means use wiktionary."
-msgstr "自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
+msgid ""
+"Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
+"which means use wiktionary."
+msgstr ""
+"自定义地址 %s 在 %s 是单词/短语时，或 'WIKTIONARY' 意味着使用 wiktionary。"
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:146
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "如果选中，Gajim 可以接受 gajim-remote 远程控制。"
 
-#: ../src/common/config.py:142
+#: ../src/common/config.py:150
 msgid "Ask before closing a group chat tab/window."
 msgstr "关闭群聊标签/窗口前询问。"
 
+#: ../src/common/config.py:151
+msgid "A list of rooms that do not require confirmation before closing"
+msgstr ""
+
 #. notif. on file complete
 #. port, used for file transfers
-#: ../src/common/config.py:145
-msgid "Overrides the host we send for File Transfer in case of address translation/port forwarding."
+#: ../src/common/config.py:154
+msgid ""
+"Overrides the host we send for File Transfer in case of address translation/"
+"port forwarding."
 msgstr "为防止地址翻译转发，忽略用以发起文件传输的主机"
 
-#: ../src/common/config.py:147
+#: ../src/common/config.py:156
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC 标准规定 KiB = 1024 字节，KB = 1000 字节。"
 
-#: ../src/common/config.py:155
+#: ../src/common/config.py:164
 msgid "Show tab when only one conversation?"
 msgstr "只有一个会话时显示标签？"
 
-#: ../src/common/config.py:156
+#: ../src/common/config.py:165
 msgid "Show tab border if one conversation?"
 msgstr "一个会话时显示标签边框？"
 
-#: ../src/common/config.py:157
+#: ../src/common/config.py:166
 msgid "Show close button in tab?"
 msgstr "在标签上显示关闭键？"
 
-#: ../src/common/config.py:162
-msgid "A semicolon-separated list of words that will be highlighted in multi-user chat."
+#: ../src/common/config.py:173
+msgid ""
+"A semicolon-separated list of words that will be highlighted in multi-user "
+"chat."
 msgstr "多用户聊天中，系统会高亮显示用分号隔开的发言列表"
 
-#: ../src/common/config.py:163
-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 "如果是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标时才会生效。"
+#: ../src/common/config.py:174
+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 ""
+"如果是， 单击窗口管理器的 X 键，会退出 Gajim。这一设定仅当启用了系统托盘图标"
+"时才会生效。"
 
-#: ../src/common/config.py:164
+#: ../src/common/config.py:175
 msgid "If True, Gajim registers for xmpp:// on each startup."
 msgstr "如果是， Gajim 会在每次启动时为 xmpp:// 注册。"
 
-#: ../src/common/config.py:165
-msgid "If True, Gajim will display an icon on each tab containing unread messages. Depending on the theme, this icon may be animated."
-msgstr "如果是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能是动态的。"
+#: ../src/common/config.py:176
+msgid ""
+"If True, Gajim will display an icon on each tab containing unread messages. "
+"Depending on the theme, this icon may be animated."
+msgstr ""
+"如果是， Gajim 会在每个含有未读消息的标签上显示一个图标。根据主题，该图标可能"
+"是动态的。"
 
-#: ../src/common/config.py:166
-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:177
+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:168
-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."
+#: ../src/common/config.py:179
+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: remvoe you and make it Gajim will not; and/or his or *her* status messages
-#: ../src/common/config.py:170
-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."
+#. FIXME: remove you and make it Gajim will not; and/or his or *her* status messages
+#: ../src/common/config.py:181
+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:330
+#: ../src/common/config.py:186
+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:188
+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:190
+msgid ""
+"Controls the window where new messages are placed.\n"
+"'always' - All messages are sent to a single window.\n"
+"'never' - All messages get their own window.\n"
+"'peracct' - Messages for each account are sent to a specific window.\n"
+"'pertype' - Each message type (e.g., chats vs. groupchats) are sent to a "
+"specific window. Note, changing this option requires restarting Gajim before "
+"the changes will take effect"
+msgstr ""
+
+#: ../src/common/config.py:191
+msgid "If False, you will no longer see the avatar in the chat window"
+msgstr ""
+
+#: ../src/common/config.py:352
 msgid "Sleeping"
 msgstr "正在睡觉"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:353
 msgid "Back soon"
 msgstr "马上回来"
 
-#: ../src/common/config.py:331
+#: ../src/common/config.py:353
 msgid "Back in some minutes."
 msgstr "很快回来"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:354
 msgid "Eating"
 msgstr "吃饭"
 
-#: ../src/common/config.py:332
+#: ../src/common/config.py:354
 msgid "I'm eating, so leave me a message."
 msgstr "正在吃饭，请留言"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:355
 msgid "Movie"
 msgstr "电影"
 
-#: ../src/common/config.py:333
+#: ../src/common/config.py:355
 msgid "I'm watching a movie."
 msgstr "正在看电影"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:356
 msgid "Working"
 msgstr "工作"
 
-#: ../src/common/config.py:334
+#: ../src/common/config.py:356
 msgid "I'm working."
 msgstr "工作中"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:357
 msgid "Phone"
 msgstr "电话"
 
-#: ../src/common/config.py:335
+#: ../src/common/config.py:357
 msgid "I'm on the phone."
 msgstr "我在打电话"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:358
 msgid "Out"
 msgstr "外出"
 
-#: ../src/common/config.py:336
+#: ../src/common/config.py:358
 msgid "I'm out enjoying life"
 msgstr "我正在享受户外生活"
 
-#: ../src/common/config.py:345
-msgid "Sound to play when a MUC message contains one of the words in muc_highlight_words, or when a MUC message contains your nickname."
-msgstr "当收到的 MUC (多用户会议) 消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
+#: ../src/common/config.py:367
+msgid ""
+"Sound to play when a MUC message contains one of the words in "
+"muc_highlight_words, or when a MUC message contains your nickname."
+msgstr ""
+"当收到的 MUC (多用户会议) 消息包含 “MUC 高亮单词”或您的昵称时播放的声音。"
 
-#: ../src/common/config.py:346
-msgid "Sound to play when any MUC message arrives. (This setting is taken into account only if notify_on_all_muc_messages is True)"
-msgstr "MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真的时候对生效)"
+#: ../src/common/config.py:368
+msgid ""
+"Sound to play when any MUC message arrives. (This setting is taken into "
+"account only if notify_on_all_muc_messages is True)"
+msgstr ""
+"MUC （多用户会议）消息到达时播放的声音。(此设置只在“提示所有 MUC 消息”为真的"
+"时候对生效)"
 
 #. sorted alphanum
-#: ../src/common/config.py:351
-#: ../src/common/optparser.py:168
+#: ../src/common/config.py:373 ../src/common/optparser.py:180
 msgid "green"
 msgstr "绿色"
 
-#: ../src/common/config.py:355
-#: ../src/common/optparser.py:154
+#: ../src/common/config.py:377 ../src/common/optparser.py:166
 msgid "grocery"
 msgstr "杂货店"
 
-#: ../src/common/config.py:359
+#: ../src/common/config.py:381
 msgid "human"
 msgstr "人类"
 
-#: ../src/common/config.py:363
+#: ../src/common/config.py:385
 msgid "marine"
 msgstr "æµ·æ´‹"
 
-#: ../src/common/config.py:367
-#: ../src/common/optparser.py:154
+#: ../src/common/config.py:389 ../src/common/optparser.py:166
 msgid "plain"
 msgstr "高原"
 
+#: ../src/common/connection.py:81
+#, fuzzy
+msgid "Unable to load idle module"
+msgstr "无法加入房间"
+
 #. password required to join
 #. we are banned
 #. room does not exist
-#: ../src/common/connection.py:454
-#: ../src/common/connection.py:457
-#: ../src/common/connection.py:460
-#: ../src/common/connection.py:463
-#: ../src/common/connection.py:466
-#: ../src/common/connection.py:469
-#: ../src/common/connection.py:477
+#: ../src/common/connection.py:507 ../src/common/connection.py:510
+#: ../src/common/connection.py:513 ../src/common/connection.py:516
+#: ../src/common/connection.py:519 ../src/common/connection.py:522
+#: ../src/common/connection.py:530
 msgid "Unable to join room"
 msgstr "无法加入房间"
 
-#: ../src/common/connection.py:455
+#: ../src/common/connection.py:508
 msgid "A password is required to join this room."
 msgstr "该房间要求密码才能加入"
 
-#: ../src/common/connection.py:458
+#: ../src/common/connection.py:511
 msgid "You are banned from this room."
 msgstr "您被该房间封禁。"
 
-#: ../src/common/connection.py:461
+#: ../src/common/connection.py:514
 msgid "Such room does not exist."
 msgstr "不存在这样的房间"
 
-#: ../src/common/connection.py:464
+#: ../src/common/connection.py:517
 msgid "Room creation is restricted."
 msgstr "房间创建受限。"
 
-#: ../src/common/connection.py:467
+#: ../src/common/connection.py:520
 msgid "Your registered nickname must be used."
 msgstr "您注册的昵称已被使用"
 
-#: ../src/common/connection.py:470
+#: ../src/common/connection.py:523
 msgid "You are not in the members list."
 msgstr "您不在成员名单中。"
 
-#: ../src/common/connection.py:478
+#: ../src/common/connection.py:531
 msgid ""
 "Your desired nickname is in use or registered by another occupant.\n"
 "Please specify another nickname below:"
@@ -3901,101 +4134,101 @@ msgstr ""
 "您申请的昵称正在使用或被其他人占有。\n"
 "从下列昵称中另外指定一个："
 
-#: ../src/common/connection.py:504
-#: ../src/common/connection.py:1954
+#: ../src/common/connection.py:557 ../src/common/connection.py:2097
 msgid "I would like to add you to my roster."
 msgstr "我申请添加您到联系人名单"
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection.py:509
+#: ../src/common/connection.py:562
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr " %s 请求认证"
 
-#: ../src/common/connection.py:511
+#: ../src/common/connection.py:564
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr " %s 请求解除认证"
 
-#: ../src/common/connection.py:513
+#: ../src/common/connection.py:566
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "%s 解除了认证"
 
-#: ../src/common/connection.py:550
-#: ../src/common/connection.py:572
-#: ../src/common/connection.py:601
+#: ../src/common/connection.py:603 ../src/common/connection.py:625
+#: ../src/common/connection.py:654
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "帐户“%s”的连接丢失"
 
-#: ../src/common/connection.py:551
-#: ../src/common/connection.py:573
-#: ../src/common/connection.py:602
+#: ../src/common/connection.py:604 ../src/common/connection.py:626
+#: ../src/common/connection.py:655
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "您需要重新连接才能继续收发消息。"
 
-#: ../src/common/connection.py:1280
+#: ../src/common/connection.py:1382
 #, 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/ 的名单管理工具移除。"
+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/ 的名"
+"单管理工具移除。"
 
-#: ../src/common/connection.py:1636
-#: ../src/common/connection.py:1709
-#: ../src/common/connection.py:2040
+#: ../src/common/connection.py:1757 ../src/common/connection.py:1838
+#: ../src/common/connection.py:2183
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "尚未连接到“%s”"
 
-#: ../src/common/connection.py:1641
+#: ../src/common/connection.py:1762
 #, python-format
 msgid "Connected to server %s:%s with %s"
 msgstr "连接到服务器 %s:%s 通过 %s"
 
-#: ../src/common/connection.py:1710
+#: ../src/common/connection.py:1839
 msgid "Check your connection or try again later"
 msgstr "检查连接并稍后重试"
 
-#: ../src/common/connection.py:1727
+#: ../src/common/connection.py:1856
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "“%s”登录验证失败"
 
-#: ../src/common/connection.py:1728
+#: ../src/common/connection.py:1857
 msgid "Please check your login and password for correctness."
 msgstr "请检查登录信息和密码的正确性"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1798
+#: ../src/common/connection.py:1927
 msgid "OpenPGP passphrase was not given"
 msgstr "未获得 OpenPGP 密文"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1800
+#: ../src/common/connection.py:1929
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "您将在无 OpenPGP 情况下连接到 %s。"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1833
+#: ../src/common/connection.py:1962
 msgid "invisible"
 msgstr "隐身"
 
-#: ../src/common/connection.py:1834
+#: ../src/common/connection.py:1963
 msgid "offline"
 msgstr "离线"
 
-#: ../src/common/connection.py:1835
+#: ../src/common/connection.py:1964
 #, python-format
 msgid "I'm %s"
 msgstr "我是 %s"
 
 #. we're not english
-#: ../src/common/connection.py:1905
+#: ../src/common/connection.py:2034
 msgid "[This message is encrypted]"
 msgstr "[本条消息已加密]"
 
-#: ../src/common/connection.py:1932
+#: ../src/common/connection.py:2061
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -4004,17 +4237,16 @@ msgstr ""
 "主题：%s\n"
 "%s"
 
-#: ../src/common/connection.py:2009
+#: ../src/common/connection.py:2152
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "代理 %s 所需的注册信息未按时抵达"
 
-#: ../src/common/connection.py:2352
+#: ../src/common/connection.py:2520
 msgid "Timeout"
 msgstr "超时"
 
-#: ../src/common/connection.py:2393
-#: ../src/common/connection.py:2405
+#: ../src/common/connection.py:2561 ../src/common/connection.py:2573
 msgid "A protocol error has occured:"
 msgstr "发生了一个协议错误："
 
@@ -4136,10 +4368,6 @@ msgstr "隐身(_I)"
 msgid "Invisible"
 msgstr "隐身"
 
-#: ../src/common/helpers.py:228
-msgid "Not in Roster"
-msgstr "不在名单中"
-
 #: ../src/common/helpers.py:230
 msgid "?contact has status:Unknown"
 msgstr "?contact has status: 未知"
@@ -4227,8 +4455,47 @@ msgstr "关闭了聊天窗口或标签"
 msgid "error: cannot open %s for reading"
 msgstr "错误：无法按读打开文件 %s"
 
-#: ../src/common/optparser.py:163
-#: ../src/common/optparser.py:164
+#: ../src/common/optparser.py:175 ../src/common/optparser.py:176
 msgid "cyan"
 msgstr "青色"
 
+#~ msgid "account: "
+#~ msgstr "账户："
+
+#~ msgid "Cannot remove last group"
+#~ msgstr "无法移除上一个群"
+
+#~ msgid "At least one contact group must be present."
+#~ msgstr "至少保留一个联系群组"
+
+#~ msgid "Are you sure you want to leave rooms \"%s\"?"
+#~ msgstr "确定要离开房间“ %s ”？"
+
+#~ msgid "If you close this window, you will be disconnected from these rooms."
+#~ msgstr "如果关闭此窗口，您将断开这些房间的连接。"
+
+#~ msgid "Activate/Disable notification for when a file transfer is complete"
+#~ msgstr "启用/关闭文件传送完成提示"
+
+#~ msgid "Removing selected file transfer"
+#~ msgstr "正在移除指定的文件传输"
+
+#~ msgid "Stoping selected file transfer"
+#~ msgstr "中止选定的文件传输"
+
+#~ msgid "Use a single chat window with _tabs"
+#~ msgstr "使用带标签的单个聊天窗口(_T)"
+
+#~ msgid ""
+#~ "If you close this tab and you have history disabled, the message will be "
+#~ "lost."
+#~ msgstr "如果您关闭此标签并且禁用历史，消息会丢失。"
+
+#~ msgid ""
+#~ "pysqlite2 (aka python-pysqlite2) dependency is missing. After you install "
+#~ "pysqlite3, if you want to migrate your logs to the new database, please "
+#~ "read: http://trac.gajim.org/wiki/MigrateLogToDot9DB Exiting..."
+#~ msgstr ""
+#~ "pysqlite2 (即 python-pysqlite2) 依赖丢失。在您安装 pysqlite3 后，如果您想"
+#~ "移动日志到新的数据库，请参阅：http://trac.gajim.org/wiki/"
+#~ "MigrateLogToDot9DB 退出..."