diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index 022c77736dad98ed64a7920145cb0bb50839df5a..072de5c423f76043136ca047a6f96f9c71dfa90a 100644
--- a/po/bg/LC_MESSAGES/gajim.po
+++ b/po/bg/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-26 21:22+0300\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -26,59 +26,59 @@ msgstr "Автоматично състояние поради липса на 
 msgid "Not available as a result of being idle"
 msgstr "Автоматично състояние поради липса на активност"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Спя"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Връщам се скоро"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Ще се върна след малко."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Хапвам"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Хапвам, оставете съобщение."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Филм"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Гледам филм."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Работя"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Работя."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Говоря по телефона."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Навън"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Наслаждавам се на живота навън"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -87,7 +87,7 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr ""
 "Бих искал(а) да ви добавя към списъка си. I would like to add you to my "
@@ -129,87 +129,69 @@ msgstr ""
 "За да продължите да изпращате и получавате съобщения, трябва да се свържете "
 "наново."
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Грешка:"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не може да се осъществи свързване с „%s“"
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Проверете връзката или опитайте отново по-късно"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Свързан към сървър с %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Неуспех при удостоверяването с „%s“"
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Проверете дали името и паролата са правилни."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "невидим"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "изключен"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "%s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "Не беше зададена парола за OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Ще бъдете свързани към „%s“ без OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Това съобщение е криптирано]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Проверете връзката или опитайте отново по-късно."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Връзката с „%s“ е прекъсната"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"Изтекоха %s секунди, а сървъра не отговори на заявката за поддържане на "
-"връзката. Ако считате, че подобно разпадане на връзката не би трябвало да се "
-"случва, може да изключите изпращането на пакети за поддържане на връзката от "
-"настройките на акаунта."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "грешка при обработката на xmpp:"
 
@@ -393,14 +375,14 @@ msgstr "създаване на папка %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "грешка: %s не може да бъде отворен за четене"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, python-format
 msgid "Unable to write file in %s"
 msgstr "Неуспех при запазването на файла в %s"
@@ -417,37 +399,37 @@ msgstr "Стойност"
 msgid "Type"
 msgstr "Тип"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Разговор"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Стая"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "акаунт: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "не е в списъка"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Превключване на %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -463,37 +445,37 @@ msgstr ""
 "\n"
 "Осветяването на неправилно изписаните думи няма да се използва"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Действия за „%s“"
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Четене на статия от _Уикипедия"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Проверка в _речника"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Липсва „%s“ в URL за търсене"
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "_Търсене в уеб"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -527,7 +509,7 @@ msgstr "текст на съобщението за състояние"
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Всички файлове"
 
@@ -567,7 +549,7 @@ msgstr "Невалиден Jabber ID"
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID трябва да бъде под формата на „user@server“"
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Невалидна парола"
 
@@ -600,8 +582,8 @@ msgid "You must create your account before editing your personal information."
 msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
-#: ../src/config.py:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
@@ -629,7 +611,7 @@ msgstr "Изберете вашия OpenPGP ключ"
 msgid "No key selected"
 msgstr "Няма избран ключ"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Име"
 
@@ -638,11 +620,11 @@ msgid "Server"
 msgstr "Сървър"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Транспорти"
 
@@ -664,11 +646,11 @@ msgstr "Текст"
 msgid "Image"
 msgstr "Изображение"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Изображението е твърде голямо"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -676,71 +658,71 @@ msgstr ""
 "Изображението на емотиконата трябва да бъде по-малко или равно на 24 пиксела "
 "по ширина и височина."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Трябва да сте свързани, за да разглеждате наличните услуги"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Откриване на налични услуги за акаунт „%s“"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Откриване на услуги"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Услуга"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Възел"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Редактиране"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Акаунт „%s“ е свързан към сървъра"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Ако го премахнете, връзката ще се разпадне."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Нова стая"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Тази отметка съдържа невалидни данни"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr "Попълнете полетата за сървър и стая или изтрийте тази отметка."
 
-#: ../src/config.py:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -750,7 +732,7 @@ msgstr ""
 "Може да настроите допълнителните опции от менюто „Редактиране“->„Акаунти“ в "
 "основния прозорец."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -760,11 +742,11 @@ msgstr ""
 "Може да настроите допълнителните опции от менюто „Редактиране“->„Акаунти“ в "
 "основния прозорец."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Трябва да въведете име на потребител за новия акаунт."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr "Трябва да въведете валиден адрес на сървър за добавяне на акаунт."
 
@@ -792,55 +774,55 @@ msgstr "Трябва да съществува поне една група."
 msgid "Group"
 msgstr "Група"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "В групата"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "Номер на ключ"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Име на контакта"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Съобщение за състояние „%s“"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Попълнете данните за контакта, който искате да добавите към акаунт „%s“"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Попълнете данните за контакта, който искате да добавите"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Невалидно потребителско име"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Контактите трябва да бъдат във формата „user@servername“."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - GTK+ Jabber клиент"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Версия %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "GTK Jabber клиент"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr ""
 "Явор Доганов <yavor@doganov.org>\n"
@@ -849,40 +831,40 @@ msgstr ""
 "Научете повече за нас на http://gnome.cult.bg\n"
 "Докладвайте за грешки на http://gnome.cult.bg/bugs"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Искане за записване за акаунт „%s“ от %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Искане за записване от %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 msgid "You can not join a group chat unless you are connected."
 msgstr "Трябва да сте свързани, за да влезете в стая."
 
-#: ../src/dialogs.py:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Влизане в стая като %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Влизане в стая"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Ново съобщение като %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Ново съобщение"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -891,105 +873,105 @@ msgstr ""
 "искате да изпратите съобщение:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "В момента няма връзка"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Уверете се, че сте свързани към „%s“."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Невалиден JID на контакта"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr ""
 "Jabber ID на контакта трябва да бъде във формата „username@servername“."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Трябва да сте свързани, за да променяте паролата."
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Трябва да въведете парола."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Паролите не съвпадат"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 msgid "The passwords typed in both fields must be identical."
 msgstr "Паролите, написани в двете полета, трябва да са едни и същи."
 
-#: ../src/dialogs.py:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Включи се контакт"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Изключи се контакт"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Ново еднократно съобщение"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Запитване за файлов трансфер"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Грешка при файловия трансфер"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Файловият трансфер е приключен"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Файловият трансфер е преустановен"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Еднократно съобщение като %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Еднократно съобщение"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Изпращане на %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "Относно: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -1004,26 +986,26 @@ msgstr ""
 "== Оригинално съобщение ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML конзола за %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "XML конзола"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Отказване"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Поканени сте в стаята „%s“ от „%s“"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Коментар: %s"
@@ -1038,58 +1020,58 @@ msgstr "HTTP (%s) упълномощаване за „%s“"
 msgid "Do you accept this request?"
 msgstr "Приемате ли това запитване?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "грешка при изпращане"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Общи"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Упълномощаването е прието"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Контактът „%s“ ви упълномощи да виждате състоянието му."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контактът „%s“ премахна записването за вас"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Винаги ще го виждате като изключен."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Не може да бъде установен контакт с „%s“"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Регистрацията на акаунта е успешна"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Акаунтът „%s“ беше регистриран в Jabber сървъра."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Паролата е грешна"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "В момента сте свързани без OpenPGP ключ."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Настройките на могат да бъдат запазени"
 
@@ -1097,15 +1079,15 @@ msgstr "Настройките на могат да бъдат запазени"
 msgid "Theme"
 msgstr "Тема"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr "име на тема"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "име_на_тема"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Току-що получихте ново съобщение в стая „%s“"
@@ -1202,22 +1184,22 @@ msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Може да организирате отметките чрез менюто „Действия“."
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Може да уточните причина по-долу:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Изритване на %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
 "lost."
@@ -1256,114 +1238,114 @@ msgstr "Няма наличен session bus"
 msgid "D-Bus is not present on this machine"
 msgstr "На тази машина няма инсталиран D-Bus"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Нова _стая"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Управление на отметките..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "към акаунт „%s“"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "като %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "за акаунт „%s“"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s вече е %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспортът „%s“ ще бъде премахнат"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr ""
 "Вече няма да можете да получавате и изпращате съобщения до контакти от „%s“"
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Задаване на OpenPGP ключ"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Изберете ключ за този контакт"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr ""
 "Бих искал(а) да Ви добавя към списъка си. I would like to add you to my "
 "roster."
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Преименуване"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "С_вързване"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "Изкл_ючване"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Редактиране"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Премахване от списъка"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1372,46 +1354,46 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът „%s“ "
 "винаги ще ви вижда изключен."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Въведете парола за GPG ключ за акаунт „%s“"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1425,7 +1407,7 @@ msgstr ""
 msgid "as "
 msgstr "като "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr "Всички контакти в тази група са изключени или има грешки"
 
@@ -1440,12 +1422,12 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Току-що получихте ново съобщение от „%s“"
 
-#: ../src/tabbed_chat_window.py:275
+#: ../src/tabbed_chat_window.py:276
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -1454,29 +1436,29 @@ msgstr ""
 "историята, съобщението ще бъде загубено."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "В момента няма връзка"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Съобщението не може да бъде изпратено, докато не се свържете."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Неуспех при изпращането на частно съобщение"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вече не сте в стая „%s“ или „%s“ е напуснал(а)."
 
-#: ../src/tabbed_chat_window.py:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Криптирането е включено"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Криптирането е изключено"
 
@@ -1503,15 +1485,15 @@ msgstr "Неизвестен"
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/vcard.py:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Трябва да сте свързани, за да изтеглите визитката"
 
@@ -2003,7 +1985,7 @@ msgstr "Формат: гггг-мм-дд"
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3091,99 +3073,99 @@ msgstr "списък с файлови трансфери"
 msgid "minutes"
 msgstr "минути"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - едно непрочетено съобщение"
 msgstr[1] "Gajim - %d непрочетени съобщения"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr "Роля: "
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr "Връзка: "
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Състояние: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Име: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Записване: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Изтегляне"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Качване"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Изпращач: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Получател: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Размер: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Прехвърлени: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr "Не е започнал"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr "Преустановен"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr "Завършил"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr "Временно преустановен"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr "Блокирал"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr "Прехвърляне"
 
@@ -3431,7 +3413,7 @@ msgstr "ако е указано, файлът бъде изпратен от т
 msgid "Missing argument \"contact_jid\""
 msgstr "Липсващ аргумент „contact_jid“"
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Услугата не е достъпна"
 
@@ -3484,12 +3466,12 @@ msgstr ""
 "Употреба: %s команда [аргументи]\n"
 "Командата е една от:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Неизвестен тип %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3497,3 +3479,16 @@ msgid ""
 msgstr ""
 "Не е указан аргумент „%s“.\n"
 "Напишете „%s help %s“ за повече информация"
+
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Връзката с „%s“ е прекъсната"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "Изтекоха %s секунди, а сървъра не отговори на заявката за поддържане на "
+#~ "връзката. Ако считате, че подобно разпадане на връзката не би трябвало да "
+#~ "се случва, може да изключите изпращането на пакети за поддържане на "
+#~ "връзката от настройките на акаунта."
diff --git a/po/cs/LC_MESSAGES/gajim.po b/po/cs/LC_MESSAGES/gajim.po
index cd33bd54de90e2a8039847dacabf41b638667530..57c38361503c43d909ce303ea8a4571c6e2e0b2b 100644
--- a/po/cs/LC_MESSAGES/gajim.po
+++ b/po/cs/LC_MESSAGES/gajim.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-18 23:26+0200\n"
 "Last-Translator: Pihhan <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -39,59 +39,59 @@ msgstr "Pryč jako výsledek nečinnosti"
 msgid "Not available as a result of being idle"
 msgstr "Nedostupný jako výsledek nečinnosti"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Spím"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Hned jsem zpět"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Jsem zpátky za pár minut."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Jím"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Právě jím, prosím zanechte mi zprávu."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Dívám se na film."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Pracuji"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Právě pracuji."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Zrovna telefonuji."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Venku"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Užívám si života venku"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -100,7 +100,7 @@ msgstr ""
 "Předmět: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Rád(a) bych si tě přidal(a) do seznamu."
 
@@ -140,86 +140,69 @@ 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:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Chyba:"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nemůžu se připojit k \"%s\""
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Ověřte připojení nebo zkuste později"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Připojen k server s %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentizace selhala s \"%s\""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Prosím zkontrolujte správnost jména a hesla."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "neviditelný"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "odpojen"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Jsem %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP heslo nebylo zadáno"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Budete připojen(a) k %s bez OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Tato zpráva je zašifrovaná]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Ověřte spojení nebo zkuste později."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim tÄ› odpojil od %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"%s sekund uběhlo a server neodpověděl na náš keep-alive. Pokud věříte, že "
-"takové odpojení by nemělo nastat, můžete vypnout posílání keep-alive v "
-"nastavení účtu."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "vyskytla se chyba při zpracování xmpp:"
 
@@ -406,14 +389,14 @@ msgstr "vytvářím adresář %s "
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "chyba: nemůžu otevřít %s pro čtení"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, fuzzy, python-format
 msgid "Unable to write file in %s"
 msgstr "Nelze zapsat soubor %s\n"
@@ -430,37 +413,37 @@ msgstr "Hodnota"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Rozhovor"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Diskuze"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "účet: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "není v seznamu"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Přepnout na %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -476,37 +459,37 @@ msgstr ""
 "\n"
 "Vlastnost zvýrazňování překlepů nebude použita"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Akce pro \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Číst článkek na _Wikipedia"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Vyhle_dat ve slovníku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL pro hledání na webu chybí \"%s\""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "_Hledat na Webu"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Předmět: %s\n"
@@ -540,7 +523,7 @@ msgstr "text stavu"
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "VÅ¡echny soubory"
 
@@ -580,7 +563,7 @@ msgstr "Neplatné Jabber ID"
 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:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Neplatné heslo"
 
@@ -612,8 +595,8 @@ msgstr "Takový účet není dostupný"
 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:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
@@ -641,7 +624,7 @@ msgstr "Vyberte Váš OpenPGP klíč"
 msgid "No key selected"
 msgstr "Není zvolen žádný klíč"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Jméno"
 
@@ -650,11 +633,11 @@ msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transporty"
 
@@ -676,11 +659,11 @@ msgstr "Text"
 msgid "Image"
 msgstr "Obrázek"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Obrázek je příliš velký"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -688,73 +671,73 @@ msgstr ""
 "Obrázek pro smajlík musí být menší nebo roven 24 pixelů na šířku a 24 pixelů "
 "na výšku."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Bez spojení nemůžete prohlížet dostupné služby"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Service Discovery s použitím účtu %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Service Discovery"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Služba"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Nód"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Editace"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Účet \"%s\" se připojil k serveru"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Pokud jej smažete, připojení bude ztraceno."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Nová místnost"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Tato záložka má neplatná data"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 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:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -764,7 +747,7 @@ msgstr ""
 "Můžete nastavit pokročilá nastaveníá použitím \"Úpravy->Účty\" z hlavního "
 "okna."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -774,11 +757,11 @@ msgstr ""
 "Nyní můžete upravit další nastavení použitím \"Úpravy->Účty\" v menu "
 "hlavního okna."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Musíte zadat uživatelské jméno při přidání účtu."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr "Musíte zadat platnou adresu server pro přidání účtu."
 
@@ -806,195 +789,195 @@ msgstr "Alespoň jedna skupina kontaktů musí zůstat."
 msgid "Group"
 msgstr "Skupina"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "Ve skupinÄ›"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "ID klíče"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Jméno kontaktu"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Text stavu %s"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Prosím vyplňte údaje kontaktu, který chcete přidat do účtu %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Neplatné uživatelské jméno"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Jména kontaktů musí být ve tvaru \"uživatel@jménoserveru\""
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - GTK+ Jabber client"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Verze %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "GTK jabber client"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "Petr Menšík <pihhan@seznam.cz>"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Žádost o autorizaci pro účet %s od %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Žádost o autorizaci od %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 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:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Připojit se do diskuze jako %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Připojit se do diskuze"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Nová zpráva jako %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Nová zpráva"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 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:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Prosím ujistěte se že jste připojen s účtem \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Neplatné ID kontaktu"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr "ID kontaktu musí být ve tvaru \"uživatel@jménoserveru\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Nemůžete měnit heslo, pokud nejste připojen(a)."
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Musíte zadat heslo."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Hesla se neshodují"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 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:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Kontakt se přihlásil"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Kontakt se odhlásil"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Nová jednoduché zpráva"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Žádost o přenos souboru"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Chyba přenosu souboru"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Přenos souboru dokončen"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Přenos souboru zastaven"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "Příjemce %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Jednoduchá zpráva jako %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Jednoduchá zpráva"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Odeslat %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -1009,26 +992,26 @@ msgstr ""
 "== Původní zpráva ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konzole pro %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "XML Konzole"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "O_dmítnout"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Byl(a) jsi pozván(a) do místnosti %s od %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentář: %s"
@@ -1043,58 +1026,58 @@ msgstr "HTTP (%s) Autorizace pro %s"
 msgid "Do you accept this request?"
 msgstr "Chcete přijmout tuto žádost?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "chyba při odesílání"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Obecné"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Autorizace přijata"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Kontakt \"%s\" Vás autorizoval k zobrazení jeho stavu."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" Vám odebral autorizaci"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Uvidíte jej vždy jako odpojeného."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt s \"%s\" nebyl navázán"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Registrace účtu úspěšná"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Účet \"%s\" byl registrování na Jabber serveru."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Vaše heslo je neplatné"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Momentálně jste připojen(a) bez vašeho OpenPGP klíče."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
@@ -1102,16 +1085,16 @@ msgstr "Nelze uložit Vaše nastavení"
 msgid "Theme"
 msgstr "Téma"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 #, fuzzy
 msgid "theme name"
 msgstr "nazev_tematu"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "nazev_tematu"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Právě jste obdržel(a) novou zprávu v místnosti \"%s\""
@@ -1207,22 +1190,22 @@ 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:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Vyhazuji %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Můžete uvést důvod níže:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Zakazuji %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
@@ -1260,112 +1243,112 @@ msgstr "Rozhraní (bus) sezení není dostupné"
 msgid "D-Bus is not present on this machine"
 msgstr "D-Bus není přítomna na tohto stroji"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Nová _Místnost"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Spravovat záložky..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "do účtu %s"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "pomocí účtu %s"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "jako %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "pro účet %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s je nyní %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" bude smazán"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr "Už více nebudete moci posílat i přijímat zprávy od kontaktů z %s."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Přiřadit OpenPGP klíč"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Vybrat klíč k použítí s kontaktem"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 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:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Přejmenovat"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "Přih_lásit"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Odhlásit"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Upravit"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "Odst_ranit ze Seznamu"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr ""
 "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho status."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, 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:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1374,46 +1357,46 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt \"%s\" Váš uvidí vždy "
 "jako odpojen."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Zadej heslo GPG klíče pro účet %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1427,7 +1410,7 @@ msgstr ""
 msgid "as "
 msgstr "jako "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 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"
 
@@ -1442,12 +1425,12 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, 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:275
+#: ../src/tabbed_chat_window.py:276
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
@@ -1455,29 +1438,29 @@ msgid ""
 msgstr "Pokud zavřete toto okno, tato zpráva bude ztracena."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Spojení není dostupné"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Va¹e zpráva nemù¾e být odeslána dokud se nepøipojíte."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 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:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Šifrování zapnuto"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Šifrování vypnuto"
 
@@ -1504,15 +1487,15 @@ msgstr "?Client:Neznámý"
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 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:404
+#: ../src/vcard.py:405
 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."
 
@@ -2007,7 +1990,7 @@ msgstr "Formát: RRRR-MM-DD"
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3090,7 +3073,7 @@ msgstr "výpis přenosů souborů"
 msgid "minutes"
 msgstr "minut"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, fuzzy, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3098,98 +3081,98 @@ msgstr[0] "Gajim - 1 nepřečtená zpráva"
 msgstr[1] "Gajim - 1 nepřečtená zpráva"
 msgstr[2] "Gajim - 1 nepřečtená zpráva"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 #, fuzzy
 msgid "Role: "
 msgstr "Postavení:"
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Stav: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Jméno: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Autorizace: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Zdroj: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Odesílatel: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Příjemce: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Velikost: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Přeneseno: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 #, fuzzy
 msgid "Not started"
 msgstr "nezačalo"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 #, fuzzy
 msgid "Stopped"
 msgstr "zastaveno"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 #, fuzzy
 msgid "Completed"
 msgstr "dokončeno"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 #, fuzzy
 msgid "Paused"
 msgstr "Pauza"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 #, fuzzy
 msgid "Stalled"
 msgstr "zamrzlé"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 #, fuzzy
 msgid "Transferring"
 msgstr "přenáším"
@@ -3439,7 +3422,7 @@ msgstr "pokud bude uvedeno, zpráva bude odeslána z tohoto účtu"
 msgid "Missing argument \"contact_jid\""
 msgstr "Chybí parametry \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Služba není dostupná"
 
@@ -3492,12 +3475,12 @@ msgstr ""
 "Použití: %s příkaz [parametry]\n"
 "Příkaz je jeden z:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Neznámý typ %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3506,6 +3489,18 @@ msgstr ""
 "Parametry \"%s\" nebyl uveden. \n"
 "Napište \"%s help %s\" pro více informací"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim tÄ› odpojil od %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "%s sekund uběhlo a server neodpověděl na náš keep-alive. Pokud věříte, že "
+#~ "takové odpojení by nemělo nastat, můžete vypnout posílání keep-alive v "
+#~ "nastavení účtu."
+
 #~ msgid "error: cannot open %s for reading\n"
 #~ msgstr "chyba: nelze otevřít %s pro čtení\n"
 
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index 3773f0cbf2544fe3dac524d95ee6eb8032b780d9..0565a60da60c744374e69d530baad422c76d52f3 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-06-01 18:11+0200\n"
 "Last-Translator: Christoph Neuroth <delmonico@gmx.net>\n"
 "Language-Team: German\n"
@@ -28,59 +28,59 @@ msgstr "Abwesend, da untätig"
 msgid "Not available as a result of being idle"
 msgstr "Nicht verfügbar, da untätig"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Schlafen"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Gleich wieder da"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Ich bin in ein paar Minuten zurück."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Essen"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Ich esse gerade, also hinterlasst eine Nachricht."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Ich sehe mir einen Film an."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Arbeit"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Ich arbeite."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Ich telefoniere."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Draußen"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Ich bin draußen und genieße das Leben"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -89,7 +89,7 @@ msgstr ""
 "Thema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Ich würde dich gerne zu meiner Liste hinzufügen."
 
@@ -129,87 +129,70 @@ 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:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Fehler:"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Konnte nicht mit %s verbinden"
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 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:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Verbindung zu Server mit %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Authentifizierung mit \"%s\" fehlgeschlagen"
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Bitte überprüfen Sie ihren Benutzernamen und Passwort."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "unsichtbar"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "abgemeldet"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Ich bin %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "Keine OpenPGP-Passphrase gewählt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Sie werden ohne OpenPGP mit %s verbunden."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Diese Nachricht ist verschlüsselt]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr ""
 "Überprüfen Sie die Verbindung oder versuchen Sie es später noch einmal."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim hat die Verbindung nach %s unterbrochen"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"Nach %s Sekunden hat der Server nicht auf keep-alive-Pakete reagiert. Wenn "
-"Sie solch einen Verbindungsabbruch verhindern möchten, können Sie das Senden "
-"von keep-alive-Paketen in den Konto-Einstellungen abschalten."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "Fehler während der Verarbeitung von xmpp:"
 
@@ -396,14 +379,14 @@ msgstr "Erstelle Verzeichnis %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, fuzzy, python-format
 msgid "Unable to write file in %s"
 msgstr "Kann Datei nicht in %s schreiben\n"
@@ -420,37 +403,37 @@ msgstr "Wert"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Chat"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Chatraum"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "Konto: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "Nicht in der Liste"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Wechseln zu %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -466,37 +449,37 @@ msgstr ""
 "\n"
 "Falschgeschriebene Wörter werden nicht hervorgehoben"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Aktionen für \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "_Wikipedia-Artikel lesen"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Im Wörterbuch _suchen"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "In Websuche URL fehlt ein \"%s\""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "Im _Internet suchen"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Thema: %s\n"
@@ -530,7 +513,7 @@ msgstr "Statusnachricht"
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Alle Dateien"
 
@@ -570,7 +553,7 @@ msgstr "Ungültige Jabber ID"
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID muss in der Form \"user@servername\" sein."
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Ungültiges Passwort"
 
@@ -604,8 +587,8 @@ msgstr ""
 "Sie müssen ein Konto erstellen bevor Sie die persönlichen Informationen "
 "ändern können"
 
-#: ../src/config.py:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
@@ -634,7 +617,7 @@ msgstr "Wählen Sie ihren OpenPGP Schlüssel"
 msgid "No key selected"
 msgstr "Kein Schlüssel gewählt"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Name"
 
@@ -643,11 +626,11 @@ msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transports"
 
@@ -669,82 +652,82 @@ msgstr "Text"
 msgid "Image"
 msgstr "Bild"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Das Bild ist zu groß"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 "Das Bild darf eine Höhe und Breite von je 24 Pixeln nicht überschreiten."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Sie müssen angemeldet sein um Dienste zu durchsuchen"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Dienste Durchsuchen für Konto %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Dienste Durchsuchen"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Dienst"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Node"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Ändern"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" ist mit Server verbunden"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Wenn Sie es entfernen, wird die Verbindung beendet."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Neuer Raum"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Dieser Bookmark hat ungültige Daten"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 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:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -753,7 +736,7 @@ msgstr ""
 "Konto wurde erfolgreich hinzugefügt.\n"
 "Erweiterte Optionen sind über \"Ändern->Konten\" zu erreichen."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -762,11 +745,11 @@ msgstr ""
 "Ihr neues Konto wurde erstellt und der Gajimkonfiguration hinzugefügt.\n"
 "Erweiterte Optionen sind über \"Ändern->Konten\" zu erreichen."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Sie müssen einen Namen für dieses Konto eingeben"
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 "Sie müssen einen gültigen Server angeben, um ein neues Konto zu erstellen."
@@ -795,93 +778,93 @@ msgstr "Mindestens eine Gruppe wird benötigt."
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "In der Gruppe"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "Schlüssel-ID"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Name des Kontakts"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status-Nachricht"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Bitte füllen Sie die Daten aus für den Kontakt, den Sie dem Konto %s "
 "hinzufügen wollen"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Bitte geben sie die Daten des neuen Kontakts ein"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Ungültiger Benutzername"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Benutzernamen müssen die Form \"benutzer@servername\" haben."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - Ein GTK+ Jabber-Client"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Ein GTK Jabber-Client"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "Ins Deutsche übersetzt von Christoph Neuroth und Fabian Neumann"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abonnement-Anforderung für Konto %s von %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abonnement-Anforderung von %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 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:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Betrete Chatraum als %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Betrete Chatraum"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Neue Nachricht als %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Neue Nachricht"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -890,104 +873,104 @@ msgstr ""
 "an den Sie eine Chat-Nachricht schicken wollen:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Verbindung nicht verfügbar"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vergewissern Sie sich, dass Sie mit \"%s\" verbunden sind."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Ungültige Benutzer-ID"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr "Benutzer-ID muss in der Form \"username@servername\" sein."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Sie müssen verbunden sein, um Ihr Passwort zu ändern"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Sie müssen ein Passwort eingeben."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 msgid "The passwords typed in both fields must be identical."
 msgstr "Die Passwörter in beiden Feldern müssen identisch sein."
 
-#: ../src/dialogs.py:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Kontakt hat sich angemeldet"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Benutzer hat sich abgemeldet"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Neue einzelne Nachricht"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "Von %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Dateitransfer Anfrage"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Dateitransfer-Fehler"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Dateitransfer beendet"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Dateitransfer gestoppt"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "An %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Einzelne Nachricht als %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Einzelne Nachricht"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Sende %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -1002,26 +985,26 @@ msgstr ""
 "== Originalnachricht ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsole für %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "XML Konsole"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Ablehnen"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr ""
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -1036,58 +1019,58 @@ msgstr "HTTP (%s) Autorisierung für %s"
 msgid "Do you accept this request?"
 msgstr "Akzeptieren Sie diese Anfrage?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "Fehler beim Senden"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Allgemein"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Autorisierung akzeptiert"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Kontakt \"%s\" hat Sie autorisiert seinen Staus zu sehen."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" hat das Abonnement zurückgezogen"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Sie sehen den Kontakt ab sofort als offline."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt mit \"%s\" konnte nicht hergestellt werden"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Kontoregistrierung erfolgreich"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Konto \"%s\" wurde auf dem Jabberserver registriert."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Ihre Passphrase ist falsch"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Sie wurden ohne ihren GPG-Schlüssel verbunden"
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Kann Einstellungen nicht speichern"
 
@@ -1095,16 +1078,16 @@ msgstr "Kann Einstellungen nicht speichern"
 msgid "Theme"
 msgstr "Thema"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 #, fuzzy
 msgid "theme name"
 msgstr "thema_name"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "thema_name"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Sie haben eine neue Nachricht im Raum \"%s\" erhalten"
@@ -1204,22 +1187,22 @@ msgstr ""
 "bearbeiten"
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "%s rausschmeißen"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Sie können eine Begründung angeben:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "%s verbannen"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
@@ -1257,112 +1240,112 @@ msgstr "Session-Bus nicht verfügbar"
 msgid "D-Bus is not present on this machine"
 msgstr "D-Bus auf diesem Computer nicht vorhanden"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Neuer _Raum"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Verwalte Bookmarks..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "an %s Konto"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "mit %s Konto"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "als %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "für Konto %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ist jetzt %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" wird entfernt"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr "Sie können nun von %s keine Nachrichten mehr senden oder empfangen."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "OpenPGP-Schlüssel Zuweisen"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Weisen Sie dem Kontakt einen Schüssel zu"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Ich würde dich gerne in meine Liste aufnehmen"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Anmelden"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Abmelden"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "_Ändern"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "Entfernen von Kontaktliste"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr ""
 "Wenn der Kontakt \"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1371,47 +1354,47 @@ msgstr ""
 "Sie entziehen dem Kontakt damit gleichzeitig zu Autorisierung.Kontakt \"%s\" "
 "wird sie immer als offline sehen."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, 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:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1423,7 +1406,7 @@ msgstr "Um Nachrichten später lesen zu können, muss der Verlauf aktiv sein."
 msgid "as "
 msgstr "als "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle Kontakte dieser Gruppe sind abgemeldet oder haben Fehler"
 
@@ -1439,12 +1422,12 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Sie haben eine neue Nachricht von \"%s\""
 
-#: ../src/tabbed_chat_window.py:275
+#: ../src/tabbed_chat_window.py:276
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
@@ -1452,29 +1435,29 @@ msgid ""
 msgstr "Wenn sie das Fenster schließen, geht die Nachricht verloren."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Keine Verbindung verfügbar"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Ihre Nachricht kann erst gesendet werden, wenn Sie verbunden sind."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Senden privater Nachricht fehlgeschlagen"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Verschlüsselung aktiviert"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Verschlüsselung deaktiviert"
 
@@ -1501,16 +1484,16 @@ msgstr "Unbekannt"
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 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:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
 
@@ -2010,7 +1993,7 @@ msgstr "Format: JJJJ-MM-TT"
 msgid "From:"
 msgstr "Von:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3105,105 +3088,105 @@ msgstr "Dateitransfer-Liste"
 msgid "minutes"
 msgstr "Minuten"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, fuzzy, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - Eine ungelesene Nachricht"
 msgstr[1] "Gajim - Eine ungelesene Nachricht"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 #, fuzzy
 msgid "Role: "
 msgstr "Rolle:"
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Name: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Abonnement: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Ressource: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Absender: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Empfänger: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Größe: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Ãœbertragen: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 #, fuzzy
 msgid "Not started"
 msgstr "nicht gestartet"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 #, fuzzy
 msgid "Stopped"
 msgstr "angehalten"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 #, fuzzy
 msgid "Completed"
 msgstr "abgeschlossen"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 #, fuzzy
 msgid "Paused"
 msgstr "Pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 #, fuzzy
 msgid "Stalled"
 msgstr "steht still"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 #, fuzzy
 msgid "Transferring"
 msgstr "übertrage"
@@ -3452,7 +3435,7 @@ msgstr "falls angegeben, wird die Nachricht über dieses Konto gesendet"
 msgid "Missing argument \"contact_jid\""
 msgstr "Fehlendes Argument \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Dienst nicht verfügbar"
 
@@ -3505,12 +3488,12 @@ msgstr ""
 "Verwendung: %s Befehl [Argumente]\n"
 "Befehl ist einer von:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Unbekannter Typ %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3519,6 +3502,18 @@ msgstr ""
 "Argument \"%s\" wurde nicht angegeben. \n"
 "Geben Sie \"%s help %s\" ein für Hilfe"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim hat die Verbindung nach %s unterbrochen"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "Nach %s Sekunden hat der Server nicht auf keep-alive-Pakete reagiert. "
+#~ "Wenn Sie solch einen Verbindungsabbruch verhindern möchten, können Sie "
+#~ "das Senden von keep-alive-Paketen in den Konto-Einstellungen abschalten."
+
 #~ msgid "error: cannot open %s for reading\n"
 #~ msgstr "Fehler: %s kann nicht zum Lesen geöffnet werden\n"
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index e45c286f71eef81fa5d84aaa59f5a0641c4e7dfc..be29ae185cc7eb4a618a0dec795e90b8f3ca5c3b 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-17 16:57+0300\n"
 "Last-Translator: Filippos Papadopoulos <filip@cs.uoi.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -28,59 +28,59 @@ msgstr "Απομακρυσμένος λόγω αδράνειας"
 msgid "Not available as a result of being idle"
 msgstr "Μη διαθέσιμος λόγω αδράνειας"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Κοιμάμαι"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Πίσω σύντομα"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Πίσω σε λίγα λεπτά."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Τρώω"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Τώρα τρώω, οπότε αφήστε μήνυμα."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Ταινία"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Βλέπω μια ταινία."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Δουλειά"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Δουλεύω."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Τηλέφωνο"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Είμαι στο τηλέφωνο."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Έξω"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Είμαι έξω στην ζωή"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -89,7 +89,7 @@ msgstr ""
 "Θέμα: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Επιθυμώ να σε προσθέσω στην λίστα επαφών μου."
 
@@ -130,86 +130,69 @@ msgstr ""
 "Για να συνεχίσετε να στέλνετε και να λαμβάνετε μηνύματα, πρέπει να "
 "επανασυνδεθείτε."
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Σφάλμα:"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Η σύνδεση με \"%s\" στάθηκε αδύνατη."
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Σύνδεση με τον διακομιστή με %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Η πιστοποίηση ταυτότητας με \"%s\" απέτυχε"
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Παρακαλώ ελέγξτε το συνθηματικό σας."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "αόρατος"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "αποσυνδεδεμένος"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Είμαι %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "Δεν δώθηκε κωδική-φράση για το OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Θα συνδεθείτε με %s χωρίς OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Aυτό το μήνυμα είναι κρυπτογραφημένο]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Ελέγξτε την σύνδεση σας ή δοκιμάστε αργότερα."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Το Gajim σας αποσύνδεσε από %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"Πέρασαν %s δευτερόλεπτα και ο διακομιστής δεν απάντησε στο keep-alive. Αν "
-"πιστεύετε ότι δεν θα έπρεπε να έχετε αποσυνδεθεί, τότε απενεργοποιήστε την "
-"αποστολή πακέτων keepalive στις επιλογές αυτού του λογαριασμού."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "σφάλμα κατά την επεξεργασία xmpp:"
 
@@ -396,14 +379,14 @@ msgstr "δημιουργία φακέλου %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "Το αρχείο %s δε μπορεί να ανοιχθεί για ανάγνωση"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, fuzzy, python-format
 msgid "Unable to write file in %s"
 msgstr "Αδύνατη η εγγραφή αρχείου σε %s\n"
@@ -420,37 +403,37 @@ msgstr "Τιμή"
 msgid "Type"
 msgstr "Είδος"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Κουβέντα"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Ομαδική Κουβέντα"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "λογαριασμός: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "εκτός λίστας επαφών"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Αλλαγή σε %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -466,37 +449,37 @@ msgstr ""
 "\n"
 "Η υπογράμμιση τυπογραφικών λαθών απενεργοποιήθηκε"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Ενέργειες για \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Ανάγνωση Άρθρου της _Wikipedia"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Εύρεση στο _Λεξικό"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Λείπει ένα \"%s\" από το URL της Δικτυακής Αναζήτησης"
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "Δικτυακή Ανα_ζήτηση γι' αυτό"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Θέμα: %s\n"
@@ -530,7 +513,7 @@ msgstr "κείμενο μηνύματος κατάστασης"
 msgid "Choose Sound"
 msgstr "Επιλογή Ήχου"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
@@ -571,7 +554,7 @@ msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 "Ένα Jabber ID πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστήs\"."
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Μη έγκυρος κωδικός"
 
@@ -605,8 +588,8 @@ msgstr ""
 "Πρέπει πρώτα να δημιουργήσετε τον λογαριασμό σας προτού ξεκινήσετε να "
 "τροποποιείτε τις προσωπικές σας πληροφορίες"
 
-#: ../src/config.py:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
@@ -636,7 +619,7 @@ msgstr "Επιλέξτε το OpenPGP κλειδί σας"
 msgid "No key selected"
 msgstr "Καμία επιλογή κλειδιού"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Όνομα"
 
@@ -645,11 +628,11 @@ msgid "Server"
 msgstr "Διακομιστής"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Μεταφορές"
 
@@ -671,11 +654,11 @@ msgstr "Κείμενο"
 msgid "Image"
 msgstr "Εικόνα"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Η εικόνα είναι πολύ μεγάλη"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -683,73 +666,73 @@ msgstr ""
 "Η εικόνα για τα σύμβολα πρέπει να είναι μικρότερη ή ίση με 24 pixel σε μήκος "
 "και 24 pixel se ύψος."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Επιλογή Εικόνας"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Πρέπει να συνδεθείτε για να περιηγηθείτε στις υπηρεσίες"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Ανακάλυψη Υπηρεσιών χρησιμοποιώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Ανακάλυψη Υπηρεσιών"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Υπηρεσία"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Κόμβος"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "Επε_ξεργασία"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Aφαιρώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Ο λογαριασμός \"%s\" είναι συνδεδεμένος με τον διακομιστή"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Αν αφαιρεθεί, η σύνδεση θα χαθεί."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Νέο Δωμάτιο"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Αυτός ο σελιδοδείκτης έχει μη έγκυρα δεδομένα"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Παρακαλώ συμπληρώστε τα πεδία του διακομιστή και του δωματίου ή διαφορετικά "
 "αφαιρέστε τον σελιδοδείκτη."
 
-#: ../src/config.py:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -759,7 +742,7 @@ msgstr ""
 "Μπορείτε να δείτε όλες τις ρυθμίσεις του λογαριασμού σας κάνοντας "
 "\"Επεξεργασία->Λογαριασμοί\" από το κεντρικό παράθυρο"
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -770,11 +753,11 @@ msgstr ""
 "Μπορείτε να ορίσετε προχωρημένες επιλογές από το \"Επεξεργασία->Λογαριασμοί"
 "\" στο μενού στο κύριου παραθύρου."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Πρέπει να δώσετε ένα όνομα χρήστη για προσθήκη νέου λογαριασμού."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 "Πρέπει να δώσετε μία έγκυρη διεύθυνση διακομιστή για προσθήκη νέου "
@@ -804,99 +787,99 @@ msgstr "Πρέπει να υπάρχει τουλάχιστον μια ομάδ
 msgid "Group"
 msgstr "Ομάδα"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "Στην ομάδα"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "Ταυτότητα Κλειδιού"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Όνομα επαφής"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Μήνυμα για Κατάσταση %s"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε στον "
 "λογαριασμό %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της επαφής που θέλετε να προσθέσετε"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Μη έγκυρο όνομα χρήστη"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr ""
 "Τα ονόματα των επαφών πρέπει να είναι στην μορφή "
 "\"όνομα_χρήστη@όνομα_διακομιστή\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Έκδοση %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Ένα πρόγραμμα για το Jabber γραμμένο σε GTK+"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr ""
 "Νίκος Κουρεμένος <kourem@gmail.com>\n"
 "Φίλιππος Παπαδόπουλος <psybases@gmail.com>"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Αίτηση εγγραφής για τον λογαριασμό %s από %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Αίτηση εγγραφής από %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εκτός αν είστε "
 "συνδεδεμένος."
 
-#: ../src/dialogs.py:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση ως %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Συμμετοχή σε Ομαδική Συζήτηση"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Νέο Μήνυμα ως %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Νέο Μήνυμα"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -905,106 +888,106 @@ msgstr ""
 "θέλετε να στείλετε ένα μήνυμα συζήτησης"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Σύνδεση μη διαθέσιμη"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Παρακαλώ βεβαιωθείτε ότι είστε συνδεδεμένοι με το \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Μη έγκυρη ταυτότητα επαφής"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr ""
 "Η ταυτότητα επαφής πρέπει να είναι στην μορφή \"όνομα_χρήστη@όνομα_διακομιστή"
 "\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Πρέπει να είστε συνδεδεμένος για να αλλάξετε τον κωδικό σας"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Πρέπει να πληκτρολογήσετε ένα κωδικό."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Οι κωδικοί δεν ταιριάζουν"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 msgid "The passwords typed in both fields must be identical."
 msgstr "Οι κωδικοί των δυο πεδίων πρέπει να είναι ίδιοι."
 
-#: ../src/dialogs.py:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Σύνδεση Επαφής"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Αποσύνδεση Επαφής"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Νέο Μονό Μήνυμα"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "Από %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Αίτηση μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Σφάλμα μεταφοράς αρχείου"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Η Μεταφορά Αρχείου Ολοκληρώθηκε"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Η Μεταφορά Αρχείου Διακόπηκε"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "σε %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Μονό Μήνυμα ως %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Μονό Μήνυμα"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Αποστολή %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -1019,26 +1002,26 @@ msgstr ""
 "== Αρχικό Μήνυμα ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Κονσόλα για %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "XML Κονσόλα"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Άρνηση"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Έχετε προσκληθεί στο δωμάτιο %s από τον/την %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
@@ -1053,58 +1036,58 @@ msgstr "HTTP (%s) Εξουσιοδότηση για %s"
 msgid "Do you accept this request?"
 msgstr "Δέχεστε αυτό το αίτημα;"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "σφάλμα κατά την αποστολή"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Γενικά"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Λήψη εξουσιοδότησης"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Η επαφή \"%s\" σας εξουσιοδότησε να βλέπετε την κατάσταση της"
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Η επαφή \"%s\" αφαίρεσαι την εγγραφή από εσάς"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Θα βλέπετε την επαφή πάντα ως αποσυνδεδεμένη"
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Δεν ήταν δυνατή η επαφή με \"%s\""
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Επιτυχής καταχώρηση λογαριασμού"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Ο λογαριασμός \"%s\" καταχωρήθηκε στον Jabber διακομιστή"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "H κωδική φράση είναι λανθασμένη"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Είστε συνδεδεμένοι χωρίς την χρήση του OpenPGP κλειδιού σας"
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Αδυναμία αποθήκευσης των προτιμήσεων σας"
 
@@ -1112,16 +1095,16 @@ msgstr "Αδυναμία αποθήκευσης των προτιμήσεων σ
 msgid "Theme"
 msgstr "Θέμα"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 #, fuzzy
 msgid "theme name"
 msgstr "όνομα_θέματος"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "όνομα_θέματος"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Μόλις λάβατε ένα νέο μήνυμα στο δωμάτιο \"%s\""
@@ -1217,22 +1200,22 @@ msgstr ""
 "κεντρικό παράθυρο."
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Διώχνοντας τον %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Μπορείτε να προσδιορίσετε ένα λόγο παρακάτω:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Απαγορεύοντας την πρόσβαση στον %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
@@ -1270,113 +1253,113 @@ msgstr "To Session bus δεν είναι διαθέσιμο"
 msgid "D-Bus is not present on this machine"
 msgstr "Δεν υπάρχει D-Bus διαθέσιμο σε αυτό το μηχάνημα"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Νέο _Δωμάτιο"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Διαχείριση Σελιδοδεικτών..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "στον λογαριασμό %s"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "χρήση του λογαριασμού %s"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "ως %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "για τον λογαριασμό %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "Ο %s είναι τώρα %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Η μεταφορά \"%s\" θα αφαιρεθεί"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr ""
 "Δεν θα μπορείτε να στείλετε και να λάβετε μηνύματα στις επαφές από το %s."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Ανάθεση OpenPGP κλειδιού"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Επιλέξτε το κλειδί που θέλετε να εφαρμόσετε στην επαφή"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Θα ήθελα να σε προσθέσω στην λίστα επαφών μου"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Μετονομασία"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Σύνδεση"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Αποσύνδεση"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "Α_φαίρεση από την Λίστα Επαφών"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr ""
 "Εάν ο \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από την λίστα επαφών σας"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1385,47 +1368,47 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση. Η επαφή "
 "\"%s\" θα σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Απαιτείται Κωδικός"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Πληκτρολογήστε την GPG κωδικοφράση για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Αποθήκευση της Κωδικοφράσης"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1439,7 +1422,7 @@ msgstr ""
 msgid "as "
 msgstr "ως "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 "Όλες οι επαφές σε αυτή την ομάδα είναι αποσυνδεδέμενες ή έχουν πρόβλημα"
@@ -1456,12 +1439,12 @@ msgstr ""
 "Ο/η %s δεν έχει στείλει ένα κλειδί OpenPGP ούτε εσείς έχετε εφαρμόσει κάποιο"
 
 #. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Mόλις λάβατε ένα μήνυμα από \"%s\""
 
-#: ../src/tabbed_chat_window.py:275
+#: ../src/tabbed_chat_window.py:276
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
@@ -1469,29 +1452,29 @@ msgid ""
 msgstr "Εάν κλείσετε αυτό το παράθυρο, το μήνυμα θα χαθεί."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Δεν υπάρχει διαθέσιμη σύνδεση"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Δεν μπορεί να από το μήνυμα σας εκτός αν είστε συνδεδεμένος."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Αποτυχία αποστολής προσωπικού μηνύματος"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Δεν είστε πια στο δωμάτιο \"%s\" ή ο/η \"%s\" έφυγε."
 
-#: ../src/tabbed_chat_window.py:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Ενεργοποιήθηκε η κρυπτογράφηση"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 
@@ -1518,17 +1501,17 @@ msgstr "Άγνωστος"
 msgid "?OS:Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/vcard.py:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
@@ -2030,7 +2013,7 @@ msgstr "Μορφή: ΕΕΕΕ-ΜΜ-ΗΗ"
 msgid "From:"
 msgstr "Από:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3129,105 +3112,105 @@ msgstr "λίστα μεταφορών αρχείων"
 msgid "minutes"
 msgstr "λεπτά"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, fuzzy, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - 1 μη αναγνωσμένο μήνυμα"
 msgstr[1] "Gajim - 1 μη αναγνωσμένο μήνυμα"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 #, fuzzy
 msgid "Role: "
 msgstr "Ρόλος:"
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Κατάσταση: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Όνομα: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Εγγραφή: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Πόρος: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Τύπος: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Λήψη"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Αποστολέας: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Παραλήπτης: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Mέγεθος: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Μεταφέρθηκαν: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 #, fuzzy
 msgid "Not started"
 msgstr "δεν έχει ξεκινήσει"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 #, fuzzy
 msgid "Stopped"
 msgstr "Διακόπηκε"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 #, fuzzy
 msgid "Completed"
 msgstr "Ολοκληρώθηκε"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 #, fuzzy
 msgid "Paused"
 msgstr "Παύση"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 #, fuzzy
 msgid "Stalled"
 msgstr "Πάγωσε"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 #, fuzzy
 msgid "Transferring"
 msgstr "Μεταφέρεται"
@@ -3488,7 +3471,7 @@ msgstr ""
 msgid "Missing argument \"contact_jid\""
 msgstr "Λείπει το όρισμα \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Η υπηρεσία δεν είναι διαθέσιμη"
 
@@ -3541,12 +3524,12 @@ msgstr ""
 "Χρήση: %s εντολή [ορίσματα]\n"
 "Η εντολή είναι μία από τις:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Άγνωστος τύπος %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3555,6 +3538,18 @@ msgstr ""
 "Το όρισμα \"%s\" δεν έχει οριστεί. \n"
 "Πληκτρολογήστε \"%s help %s\" για περισσότερες πληροφορίες"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Το Gajim σας αποσύνδεσε από %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "Πέρασαν %s δευτερόλεπτα και ο διακομιστής δεν απάντησε στο keep-alive. Αν "
+#~ "πιστεύετε ότι δεν θα έπρεπε να έχετε αποσυνδεθεί, τότε απενεργοποιήστε "
+#~ "την αποστολή πακέτων keepalive στις επιλογές αυτού του λογαριασμού."
+
 #~ msgid "error: cannot open %s for reading\n"
 #~ msgstr "σφάλμα: αδύνατη η ανάγνωση του %s\n"
 
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 944e8f20aa2a1fca7346e30683f96291837432e2..b5858be2529d7d017af5e4c1fdcba238c8ce1c14 100644
--- a/po/es/LC_MESSAGES/gajim.po
+++ b/po/es/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -25,59 +25,59 @@ msgstr "Ausente por inactividad"
 msgid "Not available as a result of being idle"
 msgstr "No disponible por inactividad"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Durmiendo"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Vuelvo pronto"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Vuelvo en unos minutos."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Comiendo"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Estoy comiendo, déjame un mensaje."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Película"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Estoy viendo una película."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Trabajando"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Estoy trabajando."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Teléfono"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Estoy al teléfono."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Fuera"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Estoy disfrutando la vida"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -86,7 +86,7 @@ msgstr ""
 "Tema: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Me gustaría añadirte a mi lista de contactos"
 
@@ -125,87 +125,70 @@ 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:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Error: "
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "No se puede conectar a %s"
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Comprueba tu conexión o inténtalo más tarde"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Conectado al servidor con %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falló la autentificación con \"%s\""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr ""
 "Por favor, comprueba que tu nombre de usuario y contraseña sean correctos."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "Invisible"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "Desconectado"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Estoy %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "No se ha facilitado la clave OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Se conectará a %s sin OpenPGP"
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Este mensaje está encriptado]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Comprueba tu conexión o reinténtalo más tarde."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim te ha desconectado de %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"Han transcurrido %s segundos y el servidor no ha respondido a nuestro "
-"mantenimiento de actividadSi crees que tal desconexión no ha ocurrido, "
-"puedes deshabilitar el mantenimiento de actividadmodificando esta cuenta."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "surgió un error mientras se procesaba xmpp"
 
@@ -389,14 +372,15 @@ msgstr "creando directorio %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "error: no se puede abrir %s para leer"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
+#, python-format
 msgid "Unable to write file in %s"
 msgstr "No se puede escribir el archivo en %s"
 
@@ -412,37 +396,37 @@ msgstr "Valor"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Charla"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Grupos de charla"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "cuenta: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "no está en el roster"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Cambiar a %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -458,37 +442,37 @@ msgstr ""
 "\n"
 "El resalto de palabras mal escritas no será usado"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Acciones para \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Leer artículo de _Wikipedia"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Buscarlo en el _Diccionario"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Falta un \"%s\" en la URL de la búsqueda web"
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "_Buscarlo en la web"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tema: %s\n"
@@ -522,7 +506,7 @@ msgstr "texto del mensaje de estado"
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Todos los archivos"
 
@@ -562,7 +546,7 @@ msgstr "ID de Jabber no válida"
 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:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Contraseña no válida"
 
@@ -594,8 +578,8 @@ msgstr "No está disponible dicha cuenta"
 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:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
@@ -623,7 +607,7 @@ msgstr "Elige tu clave OpenPGP"
 msgid "No key selected"
 msgstr "Ninguna clave seleccionada"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Nombre"
 
@@ -632,11 +616,11 @@ msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transportes"
 
@@ -658,11 +642,11 @@ msgstr "Texto"
 msgid "Image"
 msgstr "Imagen"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "La imagen es demasiado grande"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -670,73 +654,73 @@ msgstr ""
 "La imagen para el emoticono debe tener un tamaño menor o igual a 24x24 "
 "píxeles"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Sin una conexión no puedes navegar los servicios disponibles"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Gestión de servicios usando la cuenta %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Gestión de servicios"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Servicio"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Nodo"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "La cuenta \"%s\" está conectada al servidor"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 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:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Nuevo salón"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Este marcador tiene información no válida"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 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:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -746,7 +730,7 @@ msgstr ""
 "Puedes definir opciones avanzadas usando \"Editar->Cuentas\" desde laventana "
 "principal."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -756,11 +740,11 @@ msgstr ""
 "Puedes definir opciones avanzadas usando \"Edit->Accounts\" en el menú de la "
 "ventana principal"
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Debes introducir un nombre para añadir una cuenta."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 "Debes introducir una dirección de servidor válida para añadir una cuenta."
@@ -789,93 +773,93 @@ msgstr "Al menos debe existir un grupo de contactos."
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "En el grupo"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Nombre de contacto"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Mensaje de estado %s"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 "Por favor, introduce la inforamción del contacto que quieres añadir a la "
 "cuenta %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor, rellena la información del contacto que quieres añadir"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Nombre de usuario no válido"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Los nombres de contactos deben estar en la forma \"user@servername\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - Un cliente de Jabber en GTK+"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Un cliente de Jabber en GTK"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "créditos de traducción"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, 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:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Petición de adición de %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 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:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Entrar a un salón de chat como %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Entrar a un salón de chat"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Nuevo mensaje como %s "
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Nuevo mensaje"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -884,104 +868,104 @@ msgstr ""
 "un mensaje de charla:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Conexión no disponible"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, asegúrate de estar conectado con \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "ID de contacto no válida"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr "La ID del contacto debe estar en la forma \"username@servername\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Sin una conexión, no puedes cambiar tu contraseña."
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Debes introducir una contraseña."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Las contraseñas no coinciden"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 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:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Contacto conectado"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Contacto desconectado"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Nuevo mensaje"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Petición de transferencia de archivo"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Error en la transferencia del archivo"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Transferencia del archivo finalizada"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Transferencia del archivo detenida"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "A %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Nuevo mensaje como %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Mensaje:"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -996,26 +980,26 @@ msgstr ""
 "== Mensaje original ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "Consola XML para %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "Consola XML"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Denegar"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Has sido invitado al sallón %s por %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentario: %s"
@@ -1030,58 +1014,58 @@ msgstr "Autorización HTTP (%s) para %s"
 msgid "Do you accept this request?"
 msgstr "¿Aceptas esta petición?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "error durante el envío"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "General"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Autorización aceptada"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "El contacto \"%s\" te ha autorizado a ver su estado."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "El contacto \"%s\" eliminó su subscripción a tí"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Siempre le verás desconectado."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "No se ha podido establecer contacto con \"%s\""
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "La cuenta ha sido registrada con éxito"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "La cuenta \"%s\" ha sido registrada en este servidor de Jabber"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Contraseña incorrecta"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Estás actualmente conectado sin tu clave GPG"
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "No se pueden guardar las preferencias"
 
@@ -1089,15 +1073,15 @@ msgstr "No se pueden guardar las preferencias"
 msgid "Theme"
 msgstr "Tema"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr "nombre del tema"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "nombre_del_tema"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Has recibido un nuevo mensaje en el salón \"%s\""
@@ -1192,22 +1176,22 @@ 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:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Expulsando a %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Debes especificar un motivo debajo:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Baneando a %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
 "lost."
@@ -1246,111 +1230,111 @@ msgstr "El bus de la sesión no está disponible"
 msgid "D-Bus is not present on this machine"
 msgstr "D-Bus no está presente en esta máquina"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Nuevo _Salón"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Gestionar marcadores..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "a la cuenta %s"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "usando la cuenta %s"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "como %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "para la cuenta %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s está ahora %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "El transporte \"%s\" será eliminado"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr "Ya no podrás enviar y recibir mensajes a contactos desde %s"
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Asignar clave OpenPGP"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Selecciona una clave para ser aplicada al contacto"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 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:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Renombrar"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Eliminar del Roster"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1359,45 +1343,45 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. El "
 "contacto\"%s\" siempre te verá descnectado."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1411,7 +1395,7 @@ msgstr ""
 msgid "as "
 msgstr "con "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos los contactos de este grupo están desconectados o tienen errores"
 
@@ -1426,12 +1410,12 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Has recibido un nuevo mensaje de \"%s\""
 
-#: ../src/tabbed_chat_window.py:275
+#: ../src/tabbed_chat_window.py:276
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -1440,29 +1424,29 @@ msgstr ""
 "perderá."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "No hay disponible una conexión"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Tu mensaje no será enviado mientras no estés conectado."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 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:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Encriptación activada"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Encriptación desactivada"
 
@@ -1489,15 +1473,15 @@ msgstr "?Cliente:Desconocido"
 msgid "?OS:Unknown"
 msgstr "?Sistema Operativo:Desconocido"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 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:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sin una conexión, no puedes obtener tu información de contacto."
 
@@ -1833,7 +1817,9 @@ msgstr "Click para información extendida sobre el contacto"
 
 #: ../src/gtkgui.glade.h:82
 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"
+msgstr ""
+"Click para ver características (como transportes de MSN e ICQ) de los "
+"servidores de Jabber"
 
 #: ../src/gtkgui.glade.h:83
 msgid "Click to see past conversation in this room"
@@ -1987,7 +1973,7 @@ msgstr "Formato: AAAA-MM-DD"
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3077,98 +3063,99 @@ msgstr "lista de transferencias"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
+#, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - un mensaje sin leer"
 msgstr[1] "Gajim - %d mensajes sin leer"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr "Rol: "
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr "Afiliación: "
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Estado: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Nombre: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Subscripción: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Descarga"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Subida"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Remitente: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Recipiente: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Tamaño: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr "No iniciado"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr "Detenido"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr "Completado"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr "Pausado"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr "Atascado"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr "Transfiriendo"
 
@@ -3412,7 +3399,7 @@ msgstr "si es especificado el archivo será enviado usando esta cuenta"
 msgid "Missing argument \"contact_jid\""
 msgstr "No se encuentra el argumento \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Servicio no disponible"
 
@@ -3434,6 +3421,7 @@ msgid "Session bus is not available."
 msgstr "El bus de la sesión no está disponible."
 
 #: ../scripts/gajim-remote.py:221
+#, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Versión de D-Bus desconocida: %s"
 
@@ -3464,12 +3452,12 @@ msgstr ""
 "Modo de uso: %s comando [argumentos\n"
 "]Comando es uno de:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "tipo no conocido %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3478,6 +3466,18 @@ msgstr ""
 "El argumento \"%s\" no se ha especificado. \n"
 "Escribe \"%s help %s\" para más información"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim te ha desconectado de %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "Han transcurrido %s segundos y el servidor no ha respondido a nuestro "
+#~ "mantenimiento de actividadSi crees que tal desconexión no ha ocurrido, "
+#~ "puedes deshabilitar el mantenimiento de actividadmodificando esta cuenta."
+
 #~ msgid "error: cannot open %s for reading\n"
 #~ msgstr "error: no se puede abrir %s para leer\n"
 
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index b2f06edc2052f41d33016d6e46f44644b0bfc205..8a67669ec69bfdb79b4476122e77b8a9f31a65a5 100644
--- a/po/fr/LC_MESSAGES/gajim.po
+++ b/po/fr/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-06-01 20:37+0200\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team:  none\n"
@@ -27,59 +27,59 @@ msgstr "Absent car inactif"
 msgid "Not available as a result of being idle"
 msgstr "Non disponible car inactif"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Dors"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Bientôt de retour"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "De retour dans quelques minutes."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Mange"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Je mange, donc laissez moi un message."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Je regarde un film."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Travail"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Je travaille."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Téléphone"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Je suis au téléphone."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Dehors"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Je suis dehors à profiter de la vie"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -88,7 +88,7 @@ msgstr ""
 "Sujet : %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
@@ -129,86 +129,69 @@ msgstr ""
 "Pour continuer à envoyer et recevoir des messages, vous devez vous "
 "reconnecter."
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Erreur :"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossible de se connecter à \"%s\""
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Vérifiez votre connexion ou réessayer plus tard"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Connecté au serveur avec %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Echec de l'authentification avec \"%s\""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Vérifiez si votre identifiant et votre mot de passe sont corrects."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "invisible"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "Déconnecté"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Je suis %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "Mot de pqsse OpenPGP non renseignée"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Vous serez connecté à %s sans OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[ce message est chiffré]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Vérifiez votre connexion ou réessayer plus tard."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim vous a déconnecté de %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"%s secondes se sont écoulées et le serveur n'a pas répondu à nos paquets "
-"keepalive. Si vous pensez qu'une telle déconnexion ne dois pas arriver, vous "
-"pouvez désactiver l'envoie de paquets keepalive en modifiant ce compte."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "une erreur est survenue en traitant xmpp :"
 
@@ -395,14 +378,14 @@ msgstr "crée le répertoire %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erreur: impossible d'ouvrir %s en lecture"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, fuzzy, python-format
 msgid "Unable to write file in %s"
 msgstr "Impossible d'ecrire dans %s\n"
@@ -419,37 +402,37 @@ msgstr "Valeur"
 msgid "Type"
 msgstr "Type"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Discussion"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Groupes de Discussion"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "compte : "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "non dans la liste"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Basculer vers %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -465,38 +448,38 @@ msgstr ""
 "\n"
 "La vérification orthographique ne sera pas utilisée"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Actions pour \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Lire l'Article _Wikipédia"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Chercher dans le _Dictionnaire"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Il manque un \"%s\" dnas l'URL de recherche sur Internet"
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "_Rechercher sur Internet"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Sujet : %s\n"
@@ -530,7 +513,7 @@ msgstr "texte du message d'état :"
 msgid "Choose Sound"
 msgstr "Choisissez un Son"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Tous les fichiers"
 
@@ -570,7 +553,7 @@ msgstr "Identifiant Jabber invalide"
 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:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Mot de passe invalide"
 
@@ -602,8 +585,8 @@ msgstr "Compte non disponible"
 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:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
@@ -632,7 +615,7 @@ msgstr "Choisissez votre clé OpenPGP"
 msgid "No key selected"
 msgstr "Pas de clé sélectionnée"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Nom"
 
@@ -641,11 +624,11 @@ msgid "Server"
 msgstr "Serveur"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transports"
 
@@ -667,11 +650,11 @@ msgstr "Texte"
 msgid "Image"
 msgstr "Image"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "L'image est trop grande"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -679,73 +662,73 @@ msgstr ""
 "L'image pour l'émoticône doit être inférieure ou égale à 24 points en "
 "largeur et 24 points en hauteur."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Images"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Vous devez être connecté pour voir les services"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Gestion des Services du compte %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Gestion des Services"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Service"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Noeud"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Le compte \"%s\" est connecté au serveur"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Si vous l'enlevez, la connection sera perdue."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Nouveau Salon"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Ce marque-pages contient des données invalides"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Assurez-vous de remplir les champs serveur et salon ou enlevez ce marque-"
 "pages"
 
-#: ../src/config.py:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -755,7 +738,7 @@ msgstr ""
 "Vous pouvez configurer les options avancées en utilisant \"Édition->Comptes"
 "\" dans le menu de la fenêtre principale."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -765,11 +748,11 @@ msgstr ""
 "Vous pouvez configurer les options avancées en utilisant \"Édition->Comptes"
 "\" dans le menu de la fenêtre principale."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Vous devez entrer un nom d'utilisateur pour ajouter un nouveau compte."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 "Vous devez entrer une adresse de serveur valide pour ajouter un nouveau "
@@ -799,93 +782,93 @@ msgstr "Au moins un groupe de contacts doit exister."
 msgid "Group"
 msgstr "Groupe"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "Dans le groupe"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Nom du contact"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Message d'état %s"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Remplissez les informations sur le contact à ajouter au compte %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Remplissez les informations sur le contact à ajouter"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Nom d'utilisateur invalide"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Les noms des contacts doivent être de la forme \"user@servername\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - Un client Jabber en GTK+"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Version %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Un client Jabber en GTK"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "traduction francaise proposée par Yann Le Boulanger"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, 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:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Requête d'inscription de la part de %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 "Vous ne pouvez joindre un groupe de discussion tant que vous n'êtes pas "
 "connecté."
 
-#: ../src/dialogs.py:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Rejoindre un Groupe de Discussion en tant que %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Rejoindre un Groupe de Discussion"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Nouveau message en tant que %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Nouveau message"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -894,105 +877,105 @@ msgstr ""
 "envoyer un message"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Connexion non disponible"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vérifiez que vous êtes connectés avec \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Identifiant du contact invalide"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr ""
 "L'identifiant du contact doit être de la forme \"username@servername\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Vous devez être connecté pour changer votre mot de passe."
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Vous devez entrez un mot de passe."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Les mots de passe ne correspondent pas"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 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:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Contact connecté"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Contact déconnecté"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Nouveau Message Simple"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Requête de Transfert de Fichier"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Erreur de Transfert de Fichier"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Transfert de Fichier Terminé"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Transfert de Fichier Arrêté"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "À %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Message Simple en tant que %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Message Simple"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Envoyer %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -1007,26 +990,26 @@ msgstr ""
 "== Message Originel ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML pour %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Refuser"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr ""
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -1041,58 +1024,58 @@ msgstr "Demander l'Autorisation HTTP (%s) pour %s"
 msgid "Do you accept this request?"
 msgstr "Acceptez vous sa requête ?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "erreur en envoyant"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Général"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Autorisation accepté"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Le contact \"%s\" vous autorisé à voir sont statut."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Le contact \"%s\" a cessé de vous souscrire à sa présence"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Vous le verrez toujours en tant que déconnecté."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Le contact avec \"%s\" ne peut être établi"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Compté enregistré avec succès"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Le compte \"%s\" a été enregistré sur le serveur Jabber."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Votre mot de passe est incorrecte"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Vous êtes actuellement connecté sans votre clé OpenPGP."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Impossible de sauver vos préférences"
 
@@ -1100,16 +1083,16 @@ msgstr "Impossible de sauver vos préférences"
 msgid "Theme"
 msgstr "Thème"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 #, fuzzy
 msgid "theme name"
 msgstr "nom_theme"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "nom_theme"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Vous venez de recevoir un nouveau message dans le salon \"%s\""
@@ -1205,22 +1188,22 @@ msgstr ""
 "contacts."
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Exclusion de %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Vous pouvez saisir une raison en-dessous :"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Bannissement de %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
@@ -1258,112 +1241,112 @@ msgstr "Le bus de session n'est pas disponible"
 msgid "D-Bus is not present on this machine"
 msgstr "D-Bus n'est pas présent sur cette machine"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Nouveau _Salon"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Gérer les Marque-pages..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "au compte %s"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "en utilisant le compte %s"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "en tant que %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "pour le compte %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s est maintenant %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Le transport \"%s\" sera enlevé"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr ""
 "Vous ne pourrez plus envoyer et recevoir de messages aux contacts de %s."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Assigner une clé OpenPGP"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Choisissez une clé à assigner au contact"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Je souhaiterais vous ajouter à ma liste de contacts"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Renommer"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Connecter"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Déconnecter"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Éditer"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Enlever de la liste de contacts"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaitra votre état."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr "Si \"%s\" accepte cette requête, vous connaitrez son statut."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, 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:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1372,46 +1355,46 @@ msgstr ""
 "En enlevant ce contact, vous enlevez aussi son autorisation. Le contact \"%s"
 "\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, 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:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1425,7 +1408,7 @@ msgstr ""
 msgid "as "
 msgstr "avec "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 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"
 
@@ -1441,12 +1424,12 @@ msgstr ""
 "%s n'a pas envoye 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, 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:275
+#: ../src/tabbed_chat_window.py:276
 #, fuzzy
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
@@ -1454,29 +1437,29 @@ msgid ""
 msgstr "Si vous fermer cette fenêtre, ce message sera perdu."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Aucune connexion disponible"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Votre message ne peut être envoyé tant que vous n'êtes pas connecté."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Envoi du message privé échoué"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Encryption activée"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Encryption désactivée"
 
@@ -1503,15 +1486,15 @@ msgstr "Inconnu"
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 msgid "Without a connection you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/vcard.py:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Vous devez être connecté pour récupérer vos informations."
 
@@ -2010,7 +1993,7 @@ msgstr "Format : AAAA-MM-JJ"
 msgid "From:"
 msgstr "De :"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3111,105 +3094,105 @@ msgstr "liste des transferts de fichier"
 msgid "minutes"
 msgstr "minutes"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, fuzzy, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - 1 message non-lu"
 msgstr[1] "Gajim - 1 message non-lu"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 #, fuzzy
 msgid "Role: "
 msgstr "Rôle :"
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "État : "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Nom : "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Inscription : "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP : "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Ressource : "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Type : "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Télécharger"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Expéditeur : "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Destinataire : "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Taille : "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Transféré : "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 #, fuzzy
 msgid "Not started"
 msgstr "non commencé"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 #, fuzzy
 msgid "Stopped"
 msgstr "arrêté"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 #, fuzzy
 msgid "Completed"
 msgstr "terminé"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 #, fuzzy
 msgid "Paused"
 msgstr "Pause"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 #, fuzzy
 msgid "Stalled"
 msgstr "calé"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 #, fuzzy
 msgid "Transferring"
 msgstr "en train de transférer"
@@ -3462,7 +3445,7 @@ msgstr "Si cpécifié, le message sera envoyé en utilisant ce compte"
 msgid "Missing argument \"contact_jid\""
 msgstr "Argument manquant \"jid_contact\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Service non disponible"
 
@@ -3515,12 +3498,12 @@ msgstr ""
 "Utilisation : %s commande [arguments]\n"
 "commande est l'une de :\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Type inconnu %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3529,6 +3512,19 @@ msgstr ""
 "L'argument \"%s\" n'est pas précisé. \n"
 "Tappez \"%s help %s\" pour plus d'informations"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim vous a déconnecté de %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "%s secondes se sont écoulées et le serveur n'a pas répondu à nos paquets "
+#~ "keepalive. Si vous pensez qu'une telle déconnexion ne dois pas arriver, "
+#~ "vous pouvez désactiver l'envoie de paquets keepalive en modifiant ce "
+#~ "compte."
+
 #~ msgid "error: cannot open %s for reading\n"
 #~ msgstr "erreur: impossible d'ouvrir %s en lecture\n"
 
diff --git a/po/gajim.pot b/po/gajim.pot
index b97ae0b6a660b52c4d550b5f951aeb5e6e0ea1e8..1d7e64d952d2db306584006149f5f99dac2d4bd6 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -25,66 +25,66 @@ msgstr ""
 msgid "Not available as a result of being idle"
 msgstr ""
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr ""
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr ""
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr ""
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr ""
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr ""
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr ""
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr ""
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr ""
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr ""
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr ""
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
 "%s"
 msgstr ""
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr ""
 
@@ -122,83 +122,69 @@ msgstr ""
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr ""
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr ""
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr ""
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr ""
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr ""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr ""
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr ""
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr ""
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr ""
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr ""
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr ""
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr ""
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr ""
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr ""
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr ""
 
@@ -382,14 +368,14 @@ msgstr ""
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr ""
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, python-format
 msgid "Unable to write file in %s"
 msgstr ""
@@ -406,37 +392,37 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr ""
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr ""
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr ""
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr ""
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr ""
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -446,37 +432,37 @@ msgid ""
 "Highlighting misspelled words feature will not be used"
 msgstr ""
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr ""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr ""
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr ""
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr ""
 
 #. we must have %s in the url
-#: ../src/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr ""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr ""
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr ""
@@ -510,7 +496,7 @@ msgstr ""
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr ""
 
@@ -550,7 +536,7 @@ msgstr ""
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr ""
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr ""
 
@@ -582,8 +568,8 @@ msgstr ""
 msgid "You must create your account before editing your personal information."
 msgstr ""
 
-#: ../src/config.py:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr ""
 
@@ -611,7 +597,7 @@ msgstr ""
 msgid "No key selected"
 msgstr ""
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr ""
 
@@ -620,11 +606,11 @@ msgid "Server"
 msgstr ""
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr ""
 
@@ -646,99 +632,99 @@ msgstr ""
 msgid "Image"
 msgstr ""
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr ""
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr ""
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr ""
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr ""
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr ""
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr ""
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr ""
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr ""
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr ""
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr ""
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr ""
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr ""
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr ""
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr ""
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 
-#: ../src/config.py:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
 "window."
 msgstr ""
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 ""
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr ""
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr ""
 
@@ -766,195 +752,195 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr ""
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr ""
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr ""
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr ""
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr ""
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr ""
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr ""
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr ""
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr ""
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr ""
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr ""
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr ""
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr ""
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr ""
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 msgid "You can not join a group chat unless you are connected."
 msgstr ""
 
-#: ../src/dialogs.py:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr ""
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr ""
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr ""
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr ""
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 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:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr ""
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr ""
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr ""
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr ""
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr ""
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr ""
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr ""
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 msgid "The passwords typed in both fields must be identical."
 msgstr ""
 
-#: ../src/dialogs.py:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr ""
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr ""
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr ""
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr ""
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr ""
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr ""
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr ""
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr ""
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr ""
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr ""
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr ""
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr ""
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, python-format
 msgid "Received %s"
 msgstr ""
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -964,26 +950,26 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr ""
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr ""
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr ""
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr ""
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr ""
@@ -998,58 +984,58 @@ msgstr ""
 msgid "Do you accept this request?"
 msgstr ""
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr ""
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr ""
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr ""
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr ""
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr ""
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr ""
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr ""
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr ""
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr ""
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr ""
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr ""
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr ""
 
@@ -1057,15 +1043,15 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr ""
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr ""
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr ""
@@ -1158,22 +1144,22 @@ msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr ""
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
 "lost."
@@ -1210,156 +1196,156 @@ msgstr ""
 msgid "D-Bus is not present on this machine"
 msgstr ""
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr ""
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr ""
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr ""
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr ""
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr ""
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr ""
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr ""
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr ""
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr ""
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr ""
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr ""
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr ""
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr ""
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr ""
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr ""
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr ""
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr ""
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr ""
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
 "always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr ""
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr ""
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr ""
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr ""
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1371,7 +1357,7 @@ msgstr ""
 msgid "as "
 msgstr ""
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr ""
 
@@ -1386,41 +1372,41 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:275
+#: ../src/tabbed_chat_window.py:276
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
 msgstr ""
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr ""
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr ""
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr ""
 
@@ -1447,15 +1433,15 @@ msgstr ""
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 
-#: ../src/vcard.py:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 
@@ -1926,7 +1912,7 @@ msgstr ""
 msgid "From:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr ""
 
@@ -2967,99 +2953,99 @@ msgstr ""
 msgid "minutes"
 msgstr ""
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr ""
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr ""
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr ""
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr ""
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr ""
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr ""
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr ""
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr ""
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr ""
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr ""
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr ""
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr ""
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr ""
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr ""
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr ""
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr ""
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr ""
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr ""
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr ""
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr ""
 
@@ -3293,7 +3279,7 @@ msgstr ""
 msgid "Missing argument \"contact_jid\""
 msgstr ""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr ""
 
@@ -3340,12 +3326,12 @@ msgid ""
 "Command is one of:\n"
 msgstr ""
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr ""
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
diff --git a/po/nb/LC_MESSAGES/gajim.po b/po/nb/LC_MESSAGES/gajim.po
index e8cd52718bae42f54f3b75e89ba4176709326843..9644393856eaa9d524418fcae17b5ec51233b84c 100644
--- a/po/nb/LC_MESSAGES/gajim.po
+++ b/po/nb/LC_MESSAGES/gajim.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-15 08:30+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n"
@@ -23,59 +23,59 @@ msgstr "Borte på grunn av inaktivitet"
 msgid "Not available as a result of being idle"
 msgstr "Ikke tilgjengelig på grunn av inaktivitet"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Snart tilbake"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Tilbake om noen minutter."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Spiser"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Jeg spiser, så legg igjen en beskjed"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Jeg ser på en film."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Jobber"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Jeg jobber."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Jeg sitter i telefonen."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Jeg er ute og lever livet"
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -84,7 +84,7 @@ msgstr ""
 "Tittel: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Jeg vil legge deg til min kontaktliste."
 
@@ -122,86 +122,69 @@ msgstr "Tilkobling til konto \"%s\" har blitt mistet"
 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:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Feil:"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunne ikke koble til \"%s\""
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Sjekk nettverkstilgangen din og prøv igjen senere "
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Tilkoblet til server med %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering feilet med \"%s\""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Vennligst sjekk at brukernavn og passord er korrekt."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "usynlig"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "frakoblet"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Jeg er %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "OpenPGP passordsetning ble ikke gitt"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du vil bli tilbkoblet til %s uten OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Denne meldingen er kryptert]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Sjekk nettverkstilkoblingen eller prøv igjen senere."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim frakoblet deg fra %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"%s sekunder har gått og serveren svarte ikke på vår hold-i-live pakke. "
-"Dersom du mener at frakoblingen ikke skulle skjedd, så kan du stoppe "
-"sendinge av hold-i-live pakker ved å endre denne kontoen."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "feil skjedde under prosessering av xmpp."
 
@@ -385,14 +368,15 @@ msgstr "lager %s mappe"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "feil: kan ikke åpne %s for lesing"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
+#, python-format
 msgid "Unable to write file in %s"
 msgstr "Umulig å skrive fil til %s"
 
@@ -408,37 +392,37 @@ msgstr "Verdi"
 msgid "Type"
 msgstr "Skrive"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Samtale"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Gruppe Samtale"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "konto:"
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "ikke i kontaktliste"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Endre til %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -454,37 +438,37 @@ msgstr ""
 "\n"
 "Utheving av feilstavede ord funksjonen vil ikke bli brukt."
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Handlinger for \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Les_Wikipedia Artikkel"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Slå det opp i _Ordbok"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "Web Søk URL mangler en \"%s\""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "Web _Søk etter den"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Tittel: %s\n"
@@ -518,7 +502,7 @@ msgstr "status melding tekst"
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Alle filer"
 
@@ -558,7 +542,7 @@ msgstr "Ugyldig Jabber ID"
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "En Jabber ID må skrives som \"bruker@servernavn\"."
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Ugyldig passord"
 
@@ -590,8 +574,8 @@ msgstr "Ingen slik konto tilgjengelig"
 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:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
@@ -619,7 +603,7 @@ msgstr "Velg din OpenPGP nøkkel"
 msgid "No key selected"
 msgstr "Ingen nøkkel valgt"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Navn"
 
@@ -628,11 +612,11 @@ msgid "Server"
 msgstr "Server"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transporter"
 
@@ -654,11 +638,11 @@ msgstr "Tekst"
 msgid "Image"
 msgstr "Bilde"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Bilde er for stort"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -666,71 +650,71 @@ msgstr ""
 "Bilde for uttrykksikon må være mindre enn eller lik 24 piksler i bredde og "
 "24 i høyde."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Uten en tilkobling kan du ikke liste ut tilgjengelige tjenester"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Se etter Tilgjengelige Tjenester for %s kontoen"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Se etter Tjenester"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Tjeneste"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Node"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Rediger"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Kontoen \"%s\" er tilkoblet til serveren"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Dersom du fjerner den vil tilkoblingen mistes."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Nytt Rom"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Dette bokmerket har ugyldig innhold"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 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:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -740,7 +724,7 @@ msgstr ""
 "Du kan endre avanserte instillinger under valget \"Rediger->Kontoer\" fra "
 "hoved vinduet."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -750,11 +734,11 @@ msgstr ""
 "Du kan endre avanserte konto instillinger under valget \"Rediger->Kontoer\" "
 "fra hoved vindu menyen."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Du må skrive inn et brukernavn for å legge til en konto"
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr "Du må skrive inn en gyldig server adresse for å legge til en konto."
 
@@ -782,91 +766,92 @@ msgstr "Du må ha minst en kontakt gruppe."
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "NøkkelID"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Kontakt navn"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Status Melding"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
+msgstr ""
+"Vennligst fyll inn dataene til kontakten du ønsker å legge til kontoen %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Ugyldig bruker navn"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Kontakt navn må skrives \"bruker@servernavn\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - en GTK+ Jabber klient"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Versjon %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "En GTK jabber klient"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "Stian B. Barmen <stian@barmen.nu>"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Abbnerings ønske for konto %s fra %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Abbonerings ønske fra %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 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:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Bli med i Gruppesamtale som %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Bli med i Gruppesamtale"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Ny Melding som %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Ny Melding"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -875,104 +860,104 @@ msgstr ""
 "Ã¥ sende en melding til:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Tilbkobling ikke tilgjengelig"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Vennligst sjekk at du er tilkoblet med \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Ugyldig kontakt ID"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr "Kontakt ID må skrives \"brukernavn@servernavn\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan ikke endre passordet ditt uten å være tilkoblet."
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Du må skrive inn et passord."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Passordene er ikke like"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 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:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Kontakt Logget PÃ¥"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Kontakt Logget Av"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Ny Enkelt Melding"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "Fra %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Fil Overførings Forespørsel"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Fil Overføring Feilet"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Fil Overføring Komplett"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Fil Overføring Stoppet"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "Til %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Enkel Melding som %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Enkel Melding"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Send %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -987,26 +972,26 @@ msgstr ""
 "== Original Melding ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Konsoll for %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "XML Konsoll"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Nekt"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Du har blitt invitert til %s rommet av %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
@@ -1021,58 +1006,58 @@ msgstr "HTTP (%s) Autentisering for %s"
 msgid "Do you accept this request?"
 msgstr "Godtar du denne forespørselen?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "feil ved sending"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Generelle"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Godkjenningsforespørel akseptert"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Kontakten \"%s\" har godtatt at du kan se hans/hennes status."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" fjernet abbonementet fra deg"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Du vil alltid se han/henne som frakoblet."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan ikke opprettes"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Vellykket konto registrering"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Kontoen \"%s\" har blitt registrert på Jabber serveren."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Passord setningen din er ikke riktig"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du er nå tilkoblet uten din OpenPGP nøkkel."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Kan ikke lagre dine instillinger"
 
@@ -1080,15 +1065,15 @@ msgstr "Kan ikke lagre dine instillinger"
 msgid "Theme"
 msgstr "Tema"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr "tema navn"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "tema_navn"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Du har akkurat motatt en ny melding i rom \"%s\""
@@ -1097,7 +1082,8 @@ msgstr "Du har akkurat motatt en ny melding i rom \"%s\""
 msgid ""
 "If you close this window 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 "
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
 #: ../src/groupchat_window.py:143
@@ -1184,26 +1170,27 @@ 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:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Utkasting %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Du kan spesifisere grunn under:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Utvis %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 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 "
+msgstr ""
+"Dersom du lukke denne fanen og du har slått av historikk, vil meldingen bli "
 "borte."
 
 #: ../src/history_window.py:138
@@ -1237,111 +1224,111 @@ msgstr "Sesjons buss ikke tilgjengelig"
 msgid "D-Bus is not present on this machine"
 msgstr "D-Bus finnes ikke på denne maskinen"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Nytt _Rom"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Behandle Bokmerker..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "til %s kontoen"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "på %s kontoen"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "som %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "for kontoen %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s er nå %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" vil bli fjernet"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr "Du vil ikke lenger kunne sende og motta meldinger med kontakter fra %s"
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Tilegn OpenPGP Nøkkel"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Velger en nøkkel til en kontakt"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Jeg ønsker å legge deg til min kontaktliste"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Gi nytt navn"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Logg på"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "Logg _av"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Fjern fra Kontaktliste"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "NÃ¥ vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr "Dersom \"%s\" aksepterer denne forespørselen vil du kunne hans status."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1350,45 +1337,45 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen. Kontakten \"%s\" "
 "vil alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Lagre passord"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1402,7 +1389,7 @@ msgstr ""
 msgid "as "
 msgstr "som"
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr "Alle kontakter in denne gruppen er frakoblet eller har feil"
 
@@ -1417,42 +1404,43 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, 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:275
+#: ../src/tabbed_chat_window.py:276
 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 "
+msgstr ""
+"Dersom du lukker vinduet og du har slått av historikk, så vil meldingen bli "
 "mistet."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Tilkobling ikke tilgjengelig"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Meldingen din kan ikke sendes før du er tilkoblet."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Sending av privat melding feilet"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Kryptering påslått"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Kryptering avslått"
 
@@ -1479,15 +1467,15 @@ msgstr "?Client:Ukjent"
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 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:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
 
@@ -1648,7 +1636,8 @@ msgstr "Tillat _OS informasjon å bli sendt"
 
 #: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
+msgstr ""
+"Tillat sprettopp/melding når jeg er _borte/ikke tilgjengelig/opptatt/usynlig"
 
 #: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
@@ -1822,7 +1811,8 @@ msgstr "Velg for å få kontaktens utvidede informasjon"
 
 #: ../src/gtkgui.glade.h:82
 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"
+msgstr ""
+"Klikk for å se tjenester (som MSN og ICQ transporter) på jabber serveren"
 
 #: ../src/gtkgui.glade.h:83
 msgid "Click to see past conversation in this room"
@@ -1974,7 +1964,7 @@ msgstr "Format: YYYY-MM-DD"
 msgid "From:"
 msgstr "Fra:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3058,98 +3048,99 @@ msgstr "fil overførings liste"
 msgid "minutes"
 msgstr "minutter"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
+#, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - en ulest melding"
 msgstr[1] "Gajim - %d uleste meldinger"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr "Rolle: "
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr "Tilhørighet: "
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Navn: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Abbonement: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Ressurs: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Type: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Last ned"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Avsender: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Mottaker: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Størrelse: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Overført: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr "Ikke startet"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr "Stoppet"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr "Komplett"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr "Pauset"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr "Henger"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr "Overfører"
 
@@ -3358,7 +3349,8 @@ msgstr "pgp nøkkel"
 
 #: ../scripts/gajim-remote.py:128
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
+msgstr ""
+"dersom spesifisert vil meldingen bli kryptert med denne offentlige nøkkelen"
 
 #: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be sent using this account"
@@ -3392,7 +3384,7 @@ msgstr "dersom spesifisert, vil filen bli sendt fra denne kontoen"
 msgid "Missing argument \"contact_jid\""
 msgstr "Mangler argument \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Tjenesten er ikke tilgjengelig"
 
@@ -3414,6 +3406,7 @@ msgid "Session bus is not available."
 msgstr "Sesjons buss ikke tilgjengelig."
 
 #: ../scripts/gajim-remote.py:221
+#, python-format
 msgid "Unknown D-Bus version: %s"
 msgstr "Ukjent D-Bus versjon: %s"
 
@@ -3444,12 +3437,12 @@ msgstr ""
 "Bruk: %s kommando [argumenter]\n"
 "Kommando er en av:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Ukjent type %s"
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3457,3 +3450,15 @@ msgid ""
 msgstr ""
 "Argumenteet \"%s\" er ikke spesifisert. \n"
 "Skriv \"%s hjelp %s\" for mer informasjon"
+
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim frakoblet deg fra %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "%s sekunder har gått og serveren svarte ikke på vår hold-i-live pakke. "
+#~ "Dersom du mener at frakoblingen ikke skulle skjedd, så kan du stoppe "
+#~ "sendinge av hold-i-live pakker ved å endre denne kontoen."
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index 350b091fbc50981361c7fbecd08cb5d5b30494c0..a8144eba86472ae60606ac4ced491b9af6aa6fa4 100644
--- a/po/pl/LC_MESSAGES/gajim.po
+++ b/po/pl/LC_MESSAGES/gajim.po
@@ -9,14 +9,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-26 11:42+0200\n"
 "Last-Translator: Witek KieraÅ› <pambuk@gmail.com>\n"
 "Language-Team: none\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ../src/common/config.py:51
 msgid "Away as a result of being idle"
@@ -26,59 +26,59 @@ msgstr "Status Zaraz wracam z powodu bezczynności programu"
 msgid "Not available as a result of being idle"
 msgstr "Status Nieobecny z powodu bezczynności programu"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "ÅšpiÄ™"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Niedługo wrócę"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Wrócę za jakiś czas."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Jem"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Jem. Zostaw wiadomość."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "OglÄ…dam film."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Praca"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "PracujÄ™."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Rozmawiam przez telefon."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Wyszedłem"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Wyszedłem cieszyć się życiem."
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -87,7 +87,7 @@ msgstr ""
 "Temat: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Chciałbym dodać Cię do listy kontaktów."
 
@@ -125,86 +125,69 @@ msgstr "Połączenie z kontem \"%s\"zostało zerwane."
 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:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "BÅ‚Ä…d:"
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Nie można połączyć się z \"%s\""
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Sprawdź swoje połączenie lub spróbuj później"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Połączony z serwerem z %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autoryzacja z \"%s\" nie powiodła się"
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Spawdź czy twój login i hasło są poprawne."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "Niewidoczny"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "Rozłączony"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Jestem %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "Nie podano klucza OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Zostanie połączony z %s bez obsługi OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Ta wiadomość jest zaszyfrowana]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Sprawdź swoje połączenie lub spróbuj później."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim rozłączył cię z %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"Minęło %s sekund a serwer nie odpowiedział na pakiety podtrzymujące. Jeśli "
-"uważasz, że to rozłączenie nie powinno było się przytrafić, możesz wyłączyć "
-"opcję wysyłania pakietów podtrzymujących w ustawieniach konta."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "w trakcie przetwarzania xmpp wystąpił błąd:"
 
@@ -388,14 +371,14 @@ msgstr "tworzenie katalogu %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "błąd: nie można otworzyć %s do odczytu"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, python-format
 msgid "Unable to write file in %s"
 msgstr "Nie można zapisać pliku w %s"
@@ -412,37 +395,37 @@ msgstr "Wartość"
 msgid "Type"
 msgstr "Typ"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Rozmowa"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Pokój"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "konto: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "spoza listy kontaktów"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Zmień na %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -458,37 +441,37 @@ msgstr ""
 "\n"
 "Podświedlanie błędów w pisowni nie będzie używane"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Działania dla wyrażenia \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Przeczytaj artykuł w _Wikipedii"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Szukaj w _słowniku"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "W URL-u Przeszukiwania Sieci brakuje \"%s\""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "Szukaj w _Internecie"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Temat: %s\n"
@@ -522,7 +505,7 @@ msgstr "treść informacji o statusie"
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Wszystkie pliki"
 
@@ -562,7 +545,7 @@ msgstr "Niepoprawny Jabber ID"
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID musi być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Niepoprawne hasło"
 
@@ -594,8 +577,8 @@ msgstr "Takie konto nie jest dostępne"
 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:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
@@ -624,7 +607,7 @@ msgstr "Wybierz klucz OpenPGP"
 msgid "No key selected"
 msgstr "Nie wybrano żadnego klucza"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Nazwa"
 
@@ -633,11 +616,11 @@ msgid "Server"
 msgstr "Serwer"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transporty"
 
@@ -659,11 +642,11 @@ msgstr "Tekst"
 msgid "Image"
 msgstr "Obrazek"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Obrazek jest za duży"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
@@ -671,71 +654,71 @@ msgstr ""
 "Obrazek emotikony musi mieć rozmiar mniejszy lub równy 24 pikselom długości "
 "i 24 pikselom szerokości"
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Nie możesz przeglądać usług, jeśli nie jesteś połączony."
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Przeglądanie usług dla konta %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Przeglądanie usług"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Usługi"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Węzeł"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" jest połączone z serwerem."
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Jeśli to usuniesz, połączenie zostanie zerwane."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Nowy pokój"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Ta zakładka zawiera niepoprawne dane"
 
-#: ../src/config.py:2632
+#: ../src/config.py:2633
 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:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -745,7 +728,7 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wybierając \"Modyfikuj->Konta\" w głównym "
 "oknie programu."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -755,11 +738,11 @@ msgstr ""
 "Możesz ustawić opcje zaawansowane wybierając \"Modyfikuj->Konta\" w głównym "
 "oknie programu."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Musisz wpisać nazwę użytkownika aby dodać konto."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr "Musisz wpisać poprawny adres serwera aby dodać konto."
 
@@ -787,91 +770,91 @@ msgstr "Musi istnieć przynajmniej jedna grupa kontaktów."
 msgid "Group"
 msgstr "Grupa"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "W grupie"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "Identyfikator klucza"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Nazwa kontaktu"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Informacja o statusie %s"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać do konta %s."
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Wypełnij informacje o kontakcie, który chcesz dodać."
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Niepoprawna nazwa użytkownika."
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Nazwy kontaktów muszą być postaci \"użytkownik@serwer\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - klient Jabbera napisany w GTK+."
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Wersja %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Klient jabbera w GTK."
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "Tłumaczenie na język polski: Witold Kieraś <pambuk@gmail.com>"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Prośba o autoryzację dla konta %s od %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prośba o autoryzację od %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 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:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Dołącz do pokoju jako %s."
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Dołącz do pokoju"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Nowa wiadomość jako %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Nowa wiadomość"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -880,105 +863,105 @@ msgstr ""
 "wysłać wiadomość:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Połączenie jest niedostępne"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Sprawdź, czy jesteś połączony z \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Niepoprawna nazwa użytkownika kontaktu"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr ""
 "Nazwa użytkownika kontaktu powinna być postaci \"użytkownik@nazwaserwera\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 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:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Musisz wpisać hasło."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Hasła nie zgadzają się."
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 msgid "The passwords typed in both fields must be identical."
 msgstr "Hasła wpisane w obydwu polach muszą być identyczne."
 
-#: ../src/dialogs.py:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Kontakt połączył się"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Kontakt rozłączył się"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Nowa wiadomość"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "Od %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Pytanie o przysłanie pliku"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Błąd przesyłania pliku"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Zakończono przesyłanie pliku."
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Przesyłanie pliku zatrzymane"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "Do %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Wyślij wiadomość jako %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Pojedyncza wiadomość"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Wyślij %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -993,26 +976,26 @@ msgstr ""
 "==·Oryginalna wiadomość·==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "Kosola XML dla %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "Konsola XML"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "O_dmów"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Otrzymałeś zaproszenie do pokoju %s od %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
@@ -1027,58 +1010,58 @@ msgstr "Autoryzacja HTTP (%s) dla %s"
 msgid "Do you accept this request?"
 msgstr "Czy akceptujesz tę prośbę?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "błąd przy wysyłaniu"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Ogólne"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Autoryzacja przyjęta"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Kontakt \"%s\" udzielił Ci autoryzacji."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakt \"%s\" cofnÄ…Å‚ Ci autoryzacjÄ™"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Zawsze będziesz widział ten kontakt jako niepołączony."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Nie można ustanowić połączenia z \"%s\""
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Rejestracja konta zakończona powodzeniem."
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Konto \"%s\" zostało zarejestrowane na serwerze Jabbera."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Twoje hasło jest niepoprawne."
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Jesteś aktualnie połączony bez obsługi OpenPGP."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Nie można zapisać twoich ustawień."
 
@@ -1086,15 +1069,15 @@ msgstr "Nie można zapisać twoich ustawień."
 msgid "Theme"
 msgstr "Motyw"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr "nazwa motywu"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "nazwa_motywu"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Otrzymałeś właśnie nową wiadomość w pokoju \"%s\""
@@ -1115,11 +1098,16 @@ msgstr[0] "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 msgstr[1] "Czy jesteś pewien, że chcesz opuścić pokój \"%s\"?"
 
 #: ../src/groupchat_window.py:148
+#, fuzzy
 msgid "If you close this window, you will be disconnected from this room."
+msgid_plural ""
 "If you close this window, you will be disconnected from these rooms."
-msgstr ""
-"Jeśli zamkniesz to okno, to połączenie z tym pokojem zostanie zerwane."
-"Jeśli zamkniesz to okno, to połączenie z tymi pokojami zostanie zerwane."
+msgstr[0] ""
+"Jeśli zamkniesz to okno, to połączenie z tym pokojem zostanie zerwane.Jeśli "
+"zamkniesz to okno, to połączenie z tymi pokojami zostanie zerwane."
+msgstr[1] ""
+"Jeśli zamkniesz to okno, to połączenie z tym pokojem zostanie zerwane.Jeśli "
+"zamkniesz to okno, to połączenie z tymi pokojami zostanie zerwane."
 
 #: ../src/groupchat_window.py:153
 msgid "Do not ask me again"
@@ -1189,27 +1177,28 @@ 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:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Wyrzuć %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Podaj przyczynÄ™:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Zabanuj %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 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ść."
+msgstr ""
+"Jeśłi zamkniesz tę kartę, a nie masz auktywnionej opcji historii, to "
+"utracisz tę wiadomość."
 
 #: ../src/history_window.py:138
 #, python-format
@@ -1242,112 +1231,112 @@ msgstr "Magistrala sesji nie jest dosŧępna"
 msgid "D-Bus is not present on this machine"
 msgstr "Na tym komputerze nie ma obsługi D-Bus"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Nowy _pokój"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Zarządzaj zakładkami..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "do konta %s"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "używając konta %s"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "jako %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "dla konta %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s ma teraz status %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transport \"%s\" zostanie usunięty"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from %s."
 msgstr "Nie będziesz już mógł wysyłać i odbierać wiadomości od kontaktów z %s."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Przypisz klucz OpenPGP"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Wybierz klucz, który chcesz przypisać kontaktowi"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Chciałbym dodać Cię do listy kontaktów"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Zmień nazwę"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Połącz"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "R_ozłącz"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Modyfikuj"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Usuń z listy kontaktów"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana."
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego status."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, 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:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1356,45 +1345,45 @@ msgstr ""
 "Usuwając kontakt usuwasz również autoryzację. Kontakt \"%s\" będzie zawsze "
 "widział Cię jako niepołączonego."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Wpisz hasło GPG dla konta %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1408,7 +1397,7 @@ msgstr ""
 msgid "as "
 msgstr "jako "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 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"
@@ -1426,43 +1415,43 @@ msgstr ""
 "klucza."
 
 #. %s is being replaced in the code with JID
-#: ../src/tabbed_chat_window.py:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, 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:275
+#: ../src/tabbed_chat_window.py:276
 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ść."
+"Jeśli zamkniesz tę kartę, a nie masz uaktywnionej opcji historii, to "
+"utracisz tę wiadomość."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Połączenie jest niemożliwe"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Nie możesz wysłać wiadomości dopóki nie będziesz połączony."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 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:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Szyfrowanie włączone"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Szyfrowanie wyłączone"
 
@@ -1489,15 +1478,15 @@ msgstr "?Klient: Nieznany"
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 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:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
 
@@ -1755,8 +1744,8 @@ 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 ""
-"Anuluje wybrany transfer pliku. Jeśli w systemie plików przechowywany "
-"jest nieukończony plik, to zostanie usunięty. Ta operacja jest nieodwracalna."
+"Anuluje wybrany transfer pliku. Jeśli w systemie plików przechowywany jest "
+"nieukończony plik, to zostanie usunięty. Ta operacja jest nieodwracalna."
 
 #: ../src/gtkgui.glade.h:66
 msgid "Chan_ge"
@@ -1833,7 +1822,8 @@ msgstr "Kliknij by obejrzeć rozrzeszone informacje o kontakcie"
 
 #: ../src/gtkgui.glade.h:82
 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)"
+msgstr ""
+"Kliknij by zobaczyć możliwości serwerów jabbera (np. transporty MSN czy ICQ)"
 
 #: ../src/gtkgui.glade.h:83
 msgid "Click to see past conversation in this room"
@@ -1987,7 +1977,7 @@ msgstr "Format: RRRR-MM-DD"
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -3075,99 +3065,99 @@ msgstr "Lista przesyłanych plików"
 msgid "minutes"
 msgstr "minutach"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - jedna nieprzeczytana wiadomość"
 msgstr[1] "Gajim - 1 nieprzeczytana wiadomość"
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr "Funkcja: "
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr ""
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Nazwa: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Autoryzacja: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Zasoby: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Pobieranie"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Prześlij"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Nadawca: "
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Odbiorca: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Rozmiar: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Przesłane: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr "Nie włączony"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr "Zatrzymany"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr "Ukończony"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr "Zatrzymany"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr "Wygaszony"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr "Przesyłanie"
 
@@ -3413,7 +3403,7 @@ msgstr "plik zostanie wysłany z tego konta, jeśli jest ono podane"
 msgid "Missing argument \"contact_jid\""
 msgstr "Brak argumentu \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Usługa jest niedostępna"
 
@@ -3466,12 +3456,12 @@ msgstr ""
 "Użycie: polecenie %s [argument]\n"
 "Gdzie polecenie to jedna z następujący fraz:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Nieznany typ %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3480,6 +3470,18 @@ msgstr ""
 "Argument \"%s\" nie jest określony. \n"
 "Wpisz \"%s·help·%s\" aby uzyskać więcej informacji."
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim rozłączył cię z %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "Minęło %s sekund a serwer nie odpowiedział na pakiety podtrzymujące. "
+#~ "Jeśli uważasz, że to rozłączenie nie powinno było się przytrafić, możesz "
+#~ "wyłączyć opcję wysyłania pakietów podtrzymujących w ustawieniach konta."
+
 #~ msgid "error: cannot open %s for reading\n"
 #~ msgstr "błąd: nie można otworzyć %s do odczytu\n"
 
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index efe6e170f5e5e4e09c478095df051a4259a6a0ab..0b84f32db5e586d141a86e6982830963ca615cf9 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.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-17 21:21+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-29 09:53-0300\n"
 "Last-Translator: Juracy Filho <juracy@gmail.com>\n"
 "Language-Team: none\n"
@@ -26,60 +26,59 @@ msgstr "Afastado em conseqüência de estar inativo"
 msgid "Not available as a result of being idle"
 msgstr "Não disponível em conseqüência de estar inativo"
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Dormindo"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Volto logo"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Volto em alguns minutos."
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Comendo"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Eu estou comendo, então deixe-me uma mensagem."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Filme"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Estou assistindo um filme."
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Trabalhando"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Estou trabalhando."
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Telefone"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Estou no telefone."
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Estou fora"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Estou fora curtindo a vida"
 
-#: ../src/common/connection.py:280
-#: ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -88,8 +87,7 @@ msgstr ""
 "Assunto: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340
-#: ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Eu gostaria de adiciona-lo à minha lista."
 
@@ -125,88 +123,72 @@ msgstr "Conexão com a conta \"%s\" foi perdida"
 
 #: ../src/common/connection.py:390
 msgid "To continue sending and receiving messages, you will need to reconnect."
-msgstr "Para continuar enviando e recebendo mensagens, você precisará reconectar."
+msgstr ""
+"Para continuar enviando e recebendo mensagens, você precisará reconectar."
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Erro:"
 
-#: ../src/common/connection.py:1268
-#: ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Impossível conectar a \"%s\""
 
-#: ../src/common/connection.py:1269
-#: ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Verifique sua conexão ou tente novamente mais tarde"
 
-#: ../src/common/connection.py:1272
-#: ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Conectado ao servidor com %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Falha na autenticação com \"%s\""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Por favor, verifique seu login e senha para exatidão."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "invisível"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "desconectado"
 
-#: ../src/common/connection.py:1426
-#: ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Eu estou %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 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:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Você será conectado ao %s sem OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Esta mensagem está criptografada]"
 
-#: ../src/common/connection.py:1665
-#: ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Verifique sua conexão ou tente novamente mais tarde."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim desconectou você de %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid "%s seconds have passed and server did not reply to our keep-alive. If you believe such disconnection should not have happened, you can disable sending keep-alive packets by modifying this account."
-msgstr "%s segundos se passaram e o servidor não respondeu ao nosso keep-alive. Se você acredita em tal desconexão não deve ter acontecido, você pode desabilitar o envio de pacotes keep-alive modificando esta conta."
-
-#: ../src/common/connection.py:1954
-#: ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "ocorreu um erro enquanto processava xmpp:"
 
@@ -369,14 +351,12 @@ msgstr "pausa na digitação da mensagem"
 msgid "has closed the chat window or tab"
 msgstr "fechou a janela de conversa ou aba"
 
-#: ../src/common/logger.py:43
-#: ../src/common/logger.py:55
+#: ../src/common/logger.py:43 ../src/common/logger.py:55
 #, python-format
 msgid "%s is file but it should be a directory"
 msgstr "%s é um arquivo, mas deveria ser um diretório"
 
-#: ../src/common/logger.py:44
-#: ../src/common/logger.py:56
+#: ../src/common/logger.py:44 ../src/common/logger.py:56
 msgid "Gajim will now exit"
 msgstr "Gajim sairá agora"
 
@@ -384,8 +364,7 @@ msgstr "Gajim sairá agora"
 #. rwx------
 #. dot_gajim doesn't exist
 #. is '' on win9x so avoid that
-#: ../src/common/logger.py:52
-#: ../src/common/logger.py:64
+#: ../src/common/logger.py:52 ../src/common/logger.py:64
 #: ../src/common/logger.py:67
 #, python-format
 msgid "creating %s directory"
@@ -393,15 +372,14 @@ msgstr "criando diretório %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51
-#: ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "erro: impossível abrir %s para leitura"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, python-format
 msgid "Unable to write file in %s"
 msgstr "Impossível gravar o arquivo em %s"
@@ -418,95 +396,88 @@ msgstr "Valor"
 msgid "Type"
 msgstr "Tipo"
 
-#: ../src/chat.py:123
-#: ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Conversa"
 
-#: ../src/chat.py:125
-#: ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Conferência"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "conta: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242
-#: ../src/chat.py:911
-#: ../src/dialogs.py:113
-#: ../src/dialogs.py:319
-#: ../src/dialogs.py:884
-#: ../src/dialogs.py:885
-#: ../src/gajim.py:486
-#: ../src/gajim.py:487
-#: ../src/roster_window.py:835
-#: ../src/roster_window.py:1051
-#: ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378
-#: ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736
-#: ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935
-#: ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "Fora da lista"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Alternar para %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 msgid ""
-"If that is not your language for which you want to highlight misspelled words, then please set your $LANG as appropriate. Eg. for French do export LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it global in /etc/profile.\n"
+"If that is not your language for which you want to highlight misspelled "
+"words, then please set your $LANG as appropriate. Eg. for French do export "
+"LANG=fr_FR or export LANG=fr_FR.UTF-8 in ~/.bash_profile or to make it "
+"global in /etc/profile.\n"
 "\n"
 "Highlighting misspelled words feature will not be used"
 msgstr ""
-"Se este não for o idioma para o qual você quer destacar palavras incorretas, por favor, configure a sua variável de ambiente $LANG com o valor apropriado. Por exemplo, para o francês exporte LANG=fr_FR ou exporte LANG=fr_FR.UTF-8 em ~/.bash_profile ou coloca-lo \n"
+"Se este não for o idioma para o qual você quer destacar palavras incorretas, "
+"por favor, configure a sua variável de ambiente $LANG com o valor "
+"apropriado. Por exemplo, para o francês exporte LANG=fr_FR ou exporte "
+"LANG=fr_FR.UTF-8 em ~/.bash_profile ou coloca-lo \n"
 " globalmente em/etc/profile.\n"
 "Caracteristica de destacar palavras erradas não será usada"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Ações para \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Ler Artigo da _Wikipedia"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Procurar no _Dicionário"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL de Procura na Web não existe \"%s\""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "_Procura na Web por isto"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Assunto: %s\n"
 
-#: ../src/config.py:196
-#: ../src/config.py:444
+#: ../src/config.py:196 ../src/config.py:444
 #, python-format
 msgid "Every %s _minutes"
 msgstr "A cada %s _minutos"
@@ -535,9 +506,7 @@ msgstr "texto da mensagem de status"
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/config.py:1004
-#: ../src/config.py:1963
-#: ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Todos os arquivos"
 
@@ -557,8 +526,7 @@ msgstr "Você está atualmente conectado ao servidor"
 msgid "To change the account name, you must be disconnected."
 msgstr "Para mudar o nome da conta, você deve estar disconectado."
 
-#: ../src/config.py:1209
-#: ../src/config.py:1213
+#: ../src/config.py:1209 ../src/config.py:1213
 msgid "Invalid account name"
 msgstr "Nome de conta inválido"
 
@@ -578,8 +546,7 @@ msgstr "Jabber ID Inválido:"
 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:1226
-#: ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Senha Inválida"
 
@@ -609,14 +576,11 @@ msgstr "Conta não disponível"
 
 #: ../src/config.py:1422
 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:1429
-#: ../src/config.py:2047
-#: ../src/dialogs.py:622
-#: ../src/dialogs.py:728
-#: ../src/vcard.py:375
-#: ../src/vcard.py:403
+msgstr ""
+"Você deve primeiro criar sua conta antes de editar suas informações pessoais."
+
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
@@ -632,8 +596,7 @@ msgstr "Falha enquanto recebia as chaves secretas"
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Houve um problema no recebimento de suas chaves secretas OpenPGP."
 
-#: ../src/config.py:1461
-#: ../src/gtkgui.glade.h:194
+#: ../src/config.py:1461 ../src/gtkgui.glade.h:194
 msgid "Passphrase"
 msgstr "Frase de acesso"
 
@@ -641,13 +604,11 @@ msgstr "Frase de acesso"
 msgid "Choose your OpenPGP key"
 msgstr "Escolha sua chave OpenPGP"
 
-#: ../src/config.py:1470
-#: ../src/gtkgui.glade.h:182
+#: ../src/config.py:1470 ../src/gtkgui.glade.h:182
 msgid "No key selected"
 msgstr "Nenhuma chave selecionada"
 
-#: ../src/config.py:1701
-#: ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Nome"
 
@@ -656,18 +617,11 @@ msgid "Server"
 msgstr "Servidor"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809
-#: ../src/config.py:2289
-#: ../src/dialogs.py:113
-#: ../src/dialogs.py:283
-#: ../src/dialogs.py:319
-#: ../src/roster_window.py:124
-#: ../src/roster_window.py:129
-#: ../src/roster_window.py:153
-#: ../src/roster_window.py:1929
-#: ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008
-#: ../src/systray.py:217
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
+#: ../src/roster_window.py:129 ../src/roster_window.py:153
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Transportes"
 
@@ -689,103 +643,113 @@ msgstr "Texto"
 msgid "Image"
 msgstr "Imagem"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Imagem é muito grande"
 
-#: ../src/config.py:1901
-msgid "Image for emoticon has to be less than or equal to 24 pixels in width and 24 in height."
-msgstr "Imagem para emoticon tem que ser menor ou igual a 24 pixels em largura e 24 em altura."
+#: ../src/config.py:1902
+msgid ""
+"Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
+"in height."
+msgstr ""
+"Imagem para emoticon tem que ser menor ou igual a 24 pixels em largura e 24 "
+"em altura."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/config.py:1968
-#: ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Você deve estar conectado para visualizar os serviços disponíveis"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Buscar Serviços usando conta %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Buscar Serviços"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Serviço"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Nó"
 
-#: ../src/config.py:2292
-#: ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Editar"
 
-#: ../src/config.py:2294
-#: ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Conta \"%s\" está conectada ao servidor"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Se você remover-lo, a conexão será perdida."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Nova Sala"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Bookmark tem dados inválidos"
 
-#: ../src/config.py:2632
-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:2633
+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:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
-"You can set advanced options by using \"Edit->Accounts\" from the main window."
+"You can set advanced options by using \"Edit->Accounts\" from the main "
+"window."
 msgstr ""
 "Conta foi adicionada com sucesso.\n"
-" Você pode configurar opções avançadas em \"Edit->Accounts\" na janela principal. "
+" Você pode configurar opções avançadas em \"Edit->Accounts\" na janela "
+"principal. "
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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."
+"You can set advanced account options using \"Edit->Accounts\" in the main "
+"window menu."
 msgstr ""
 "Sua nova conta foi criada e adicionada as suas configurações do gajim.\n"
-"Você pode configurar opções avançadas em \"Edit->Accounts\" na janela principal. "
+"Você pode configurar opções avançadas em \"Edit->Accounts\" na janela "
+"principal. "
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Você deve entrar com um nome para adicionar uma conta."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
-msgstr "Você deve entrar com um endereço de servidor válido para registrar uma nova conta."
+msgstr ""
+"Você deve entrar com um endereço de servidor válido para registrar uma nova "
+"conta."
 
 #: ../src/dialogs.py:55
 #, python-format
@@ -811,94 +775,94 @@ msgstr "Ao menos um grupo do contato deve estar presente."
 msgid "Group"
 msgstr "Grupo"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "Neste grupo"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Nome do Contato"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "%s Mensagem de status"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
-msgstr "Por favor, preencha os dados do contato se voçê quer adicionar na conta %s"
+msgstr ""
+"Por favor, preencha os dados do contato se voçê quer adicionar na conta %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Por favor preencha os dados do contato que você quer adicionar"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Nome de usuário inválido"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Nomes de contatos devem estar no formato \"usuário@nomedoservidor\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - Um cliente jabber GTK"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Versão %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Um cliente jabber GTK"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
-msgstr "Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
+msgstr ""
+"Alfredo Jr. - Junix <junix@infolink.com.br> e Juracy Filho <juracy@gmail.com>"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Solicitação de inscrição para conta %s de %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Solicitação de inscrição de %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 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."
+msgstr ""
+"Você não pode ingressar em uma sala de conferência até que esteja conectado."
 
-#: ../src/dialogs.py:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Ingressar numa conferência com %s"
 
-#: ../src/dialogs.py:638
-#: ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Ingressar numa conferência"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Nova Mensagem como %s"
 
-#: ../src/dialogs.py:703
-#: ../src/dialogs.py:798
-#: ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 msgid ""
 "Fill in the contact ID of the contact you would like\n"
 "to send a chat message to:"
@@ -907,119 +871,104 @@ msgstr ""
 "enviar uma mensagem:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:712
-#: ../src/dialogs.py:1025
-#: ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Conexão não disponível"
 
-#: ../src/dialogs.py:713
-#: ../src/dialogs.py:1026
-#: ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Por favor, tenha certeza que você está conectado com \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718
-#: ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "ID de contato inválido"
 
-#: ../src/dialogs.py:719
-#: ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr "ID de contato deve estar no formato \"usuário@nomedoservidor\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Você deve estar contectado para mudar sua senha"
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Você deve entrar com uma senha."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Senhas não conferem"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 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:790
-#: ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Contato conectou"
 
-#: ../src/dialogs.py:794
-#: ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Contato desconectou"
 
-#: ../src/dialogs.py:799
-#: ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Nova Mensagem"
 
-#: ../src/dialogs.py:803
-#: ../src/dialogs.py:808
-#: ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "De %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Solicitação de Transferência de Arquivos"
 
-#: ../src/dialogs.py:810
-#: ../src/gajim.py:706
-#: ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Erro na Transferência de Arquivos"
 
-#: ../src/dialogs.py:814
-#: ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Transferência do Arquivo Completa"
 
-#: ../src/dialogs.py:814
-#: ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Transferência do Arquivo Parada"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "Para %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Mensagem simples como %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Mensagem simples"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Enviar %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -1034,27 +983,26 @@ msgstr ""
 "== Mensagem Original ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "Console XML para %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "Console XML"
 
-#: ../src/dialogs.py:1186
-#: ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Negar"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Você foi convidado para a sala %s por %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Comentário: %s"
@@ -1069,61 +1017,58 @@ msgstr "Autorização HTTP (%s) para %s"
 msgid "Do you accept this request?"
 msgstr "Você aceita a solicitação?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "erro no envio"
 
-#: ../src/gajim.py:489
-#: ../src/gajim.py:499
-#: ../src/roster_window.py:126
-#: ../src/roster_window.py:1038
-#: ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Geral"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Autorização aceita"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "O contato \"%s\" autorizou você para ver seu status."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Contato \"%s\" removeu sua inscrição"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Você sempre o verá como offline."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Contato com \"%s\" não pode ser estabelecido"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Registro da conta efetuado com sucesso"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "A conta \"%s\" foi registrada no servidor Jabber"
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Sua frase de acesso está incorreta"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Você está atualmente conectado sem sua chave OpenPGP."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Impossível salvar suas preferências"
 
@@ -1131,24 +1076,26 @@ msgstr "Impossível salvar suas preferências"
 msgid "Theme"
 msgstr "Tema"
 
-#: ../src/gajim_themes_window.py:125
-#: ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr "nome do tema"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "nome_do_tema"
 
-#: ../src/groupchat_window.py:127
-#: ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Você acabou de receber uma nova mensagem na sala \"%s\""
 
 #: ../src/groupchat_window.py:128
-msgid "If you close this window and you have history disabled, this message will be lost."
-msgstr "Se você fechar esta janela e o histórico estiver desabilitado, esta mensagem será perdida."
+msgid ""
+"If you close this window and you have history disabled, this message will be "
+"lost."
+msgstr ""
+"Se você fechar esta janela e o histórico estiver desabilitado, esta mensagem "
+"será perdida."
 
 #: ../src/groupchat_window.py:143
 #, python-format
@@ -1159,7 +1106,8 @@ msgstr[1] "Você tem certeza que quer deixar as salas \"%s\"?"
 
 #: ../src/groupchat_window.py:148
 msgid "If you close this window, you will be disconnected from this room."
-msgid_plural "If you close this window, you will be disconnected from these rooms."
+msgid_plural ""
+"If you close this window, you will be disconnected from these rooms."
 msgstr[0] "Se você fechar esta janela, você será desconectado desta sala."
 msgstr[1] "Se você fechar esta janela, você será desconectado destas salas."
 
@@ -1167,8 +1115,7 @@ msgstr[1] "Se você fechar esta janela, você será desconectado destas salas."
 msgid "Do not ask me again"
 msgstr "Não me pergunte novamente"
 
-#: ../src/groupchat_window.py:213
-#: ../src/groupchat_window.py:401
+#: ../src/groupchat_window.py:213 ../src/groupchat_window.py:401
 msgid "This room has no subject"
 msgstr "Esta sala não tem assunto"
 
@@ -1229,29 +1176,32 @@ msgstr "Bookmark foi adicionado com sucesso"
 
 #: ../src/groupchat_window.py:456
 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."
+msgstr ""
+"Você pode gerenciar seus bookmarks pelo menu de Ações na janela principal."
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Chutando %s"
 
-#: ../src/groupchat_window.py:722
-#: ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Você deve especificar uma razão abaixo:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Banindo %s"
 
-#: ../src/groupchat_window.py:970
-#: ../src/tabbed_chat_window.py:343
-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/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
+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/history_window.py:138
 #, python-format
@@ -1263,8 +1213,7 @@ msgstr "%s agora está %s: %s"
 msgid "Status is now: %s: %s"
 msgstr "Status agora é: %s: %s"
 
-#: ../src/history_window.py:177
-#: ../src/history_window.py:179
+#: ../src/history_window.py:177 ../src/history_window.py:179
 #, python-format
 msgid "Conversation History with %s"
 msgstr "Histórico de Conversação com %s"
@@ -1285,172 +1234,177 @@ msgstr "Sessão bus não está disponível"
 msgid "D-Bus is not present on this machine"
 msgstr "D-Bus não está presente nesta máquina"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Você já está na sala %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Nova _Sala"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Gerenciar Bookmarks..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "para %s conta"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "usando %s conta"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "como %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "para conta %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s agora está %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporte \"%s\" será removido"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from %s."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from %s."
 msgstr "Você não poderá enviar e receber mensagens para contatos de %s."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Atribuir chave OpenPGP"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Selecione uma chave para atribuir ao contato"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Eu gostaria de adiciona-lo à minha lista"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Renomear"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Conectar"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Desconectar"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Editar"
 
-#: ../src/roster_window.py:927
-#: ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Remover da Lista"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o seu status."
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
-msgid "By removing this contact you also remove authorization. Contact \"%s\" will always see you as offline."
-msgstr "Removendo este contato, você também removerá a autorização. Contato \"%s\" sempre verá você offline."
+msgid ""
+"By removing this contact you also remove authorization. Contact \"%s\" will "
+"always see you as offline."
+msgstr ""
+"Removendo este contato, você também removerá a autorização. Contato \"%s\" "
+"sempre verá você offline."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Salvar senha"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Entre com a chave GPG para conta %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 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."
+msgstr ""
+"Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:1598
-#: ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:1599
-#: ../src/roster_window.py:1605
-msgid "Messages will only be available for reading them later if you have history enabled."
-msgstr "Mensagem somente estará disponível para leitura mais tarde se você tiver o histórico habilitado."
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
+msgid ""
+"Messages will only be available for reading them later if you have history "
+"enabled."
+msgstr ""
+"Mensagem somente estará disponível para leitura mais tarde se você tiver o "
+"histórico habilitado."
 
 #. for chat_with
 #. for new_message
-#: ../src/systray.py:178
-#: ../src/systray.py:183
+#: ../src/systray.py:178 ../src/systray.py:183
 msgid "as "
 msgstr "como "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr "Todos os contatos deste grupo estão desconectados ou existem erros"
 
-#: ../src/tabbed_chat_window.py:126
-#: ../src/gtkgui.glade.h:190
+#: ../src/tabbed_chat_window.py:126 ../src/gtkgui.glade.h:190
 msgid "OpenPGP Encryption"
 msgstr "Criptografia OpenPGP"
 
@@ -1461,40 +1415,43 @@ 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:274
-#: ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, 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:275
-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:276
+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."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Uma conexão não está disponível"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Sua mensagem não pode ser enviada até que esteja conectado."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Falha ao Enviar uma mensagem privada"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, 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:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Criptografia habilitada"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Criptografia desabilitada"
 
@@ -1521,16 +1478,15 @@ msgstr "?Cliente:Desconhecido"
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:273
-#: ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 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:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
 msgstr "Você deve estar conectado para receber suas informações de contato."
 
@@ -1641,7 +1597,9 @@ msgstr "Contas"
 
 #: ../src/gtkgui.glade.h:28
 msgid "Activate/Disable notification for when a file transfer is complete"
-msgstr "Ativar/Desativar notificação quando um transferência de arquivo estiver completa"
+msgstr ""
+"Ativar/Desativar notificação quando um transferência de arquivo estiver "
+"completa"
 
 #: ../src/gtkgui.glade.h:29
 msgid "Ad_vanced Actions"
@@ -1691,7 +1649,8 @@ msgstr "Permitir o envio de informações do _SO "
 
 #: ../src/gtkgui.glade.h:41
 msgid "Allow popup/notifications when I'm _away/na/busy/invisible"
-msgstr "Permite janela/notificação quando eu estou _afastado/NA/ocupado/invisível"
+msgstr ""
+"Permite janela/notificação quando eu estou _afastado/NA/ocupado/invisível"
 
 #: ../src/gtkgui.glade.h:42
 msgid "Also known as iChat style"
@@ -1782,8 +1741,12 @@ msgid "Cancels the selected file transfer"
 msgstr "Cancelar a transferência de arquivo selecionada"
 
 #: ../src/gtkgui.glade.h:65
-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 "Cancelar a transferência de arquivo selecionada. Se existir um arquivo incompleto, ele será removido. Esta operação não é reversível."
+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 ""
+"Cancelar a transferência de arquivo selecionada. Se existir um arquivo "
+"incompleto, ele será removido. Esta operação não é reversível."
 
 #: ../src/gtkgui.glade.h:66
 msgid "Chan_ge"
@@ -1818,12 +1781,27 @@ msgid "Check if you want to register for a new jabber account"
 msgstr "Marque esta opção se você quer registrar uma nova conta jabber"
 
 #: ../src/gtkgui.glade.h:75
-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 "Marque esta opção somente se alguém que não está na sua lista estiver mandando spams. Utilize com cuidado, porque isto bloqueia todas as mensagens de qualquer contato que você não possuir na sua lista e queria lhe enviar uma mensagem"
+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 ""
+"Marque esta opção somente se alguém que não está na sua lista estiver "
+"mandando spams. Utilize com cuidado, porque isto bloqueia todas as mensagens "
+"de qualquer contato que você não possuir na sua lista e queria lhe enviar "
+"uma mensagem"
 
 #: ../src/gtkgui.glade.h:76
-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 "Marque esta opção para o Gajim se conectar na porta 5223 onde servidores antigos disponibilizam recursos SSL. Note que o Gajim usa criptografia TLS por padrão se disponibilizada pelo servidor e com esta opção habilitada o TLS será desabilitado"
+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 ""
+"Marque esta opção para o Gajim se conectar na porta 5223 onde servidores "
+"antigos disponibilizam recursos SSL. Note que o Gajim usa criptografia TLS "
+"por padrão se disponibilizada pelo servidor e com esta opção habilitada o "
+"TLS será desabilitado"
 
 #: ../src/gtkgui.glade.h:77
 msgid "Choose _Key..."
@@ -1847,7 +1825,9 @@ msgstr "Clique para informações completas do contato"
 
 #: ../src/gtkgui.glade.h:82
 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)"
+msgstr ""
+"Clique para ver os recursos do servidor jabber (como transportes MSN, ICQ, "
+"etc)"
 
 #: ../src/gtkgui.glade.h:83
 msgid "Click to see past conversation in this room"
@@ -1911,7 +1891,9 @@ msgstr "Deletar Mensagem do Dia"
 
 #: ../src/gtkgui.glade.h:98
 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"
+msgstr ""
+"Negando a autorização do contato, ele não poderá saber quando você está "
+"conectado"
 
 #: ../src/gtkgui.glade.h:99
 msgid "Department:"
@@ -1999,8 +1981,7 @@ msgstr "Formato: YYYY-MM-DD"
 msgid "From:"
 msgstr "De:"
 
-#: ../src/gtkgui.glade.h:122
-#: ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -2009,23 +1990,40 @@ msgid "Gajim Themes Customization"
 msgstr "Customização de Temas do Gajim"
 
 #: ../src/gtkgui.glade.h:124
-msgid "Gajim will automatically show the new received message in a new chat window or tab in an existing chat window"
-msgstr "Gajim automaticamente mostrará a nova mensagem recebida em uma nova janela de conversa ou aba em uma janela existente"
+msgid ""
+"Gajim will automatically show the new received message in a new chat window "
+"or tab in an existing chat window"
+msgstr ""
+"Gajim automaticamente mostrará a nova mensagem recebida em uma nova janela "
+"de conversa ou aba em uma janela existente"
 
 #: ../src/gtkgui.glade.h:125
-msgid "Gajim will notify you for new message via a popup in the bottom right of the screen"
-msgstr "Gajim notificará você de uma nova mensagem via uma alerta visual na lateral inferior direita da tela"
+msgid ""
+"Gajim will notify you for new message via a popup in the bottom right of the "
+"screen"
+msgstr ""
+"Gajim notificará você de uma nova mensagem via uma alerta visual na lateral "
+"inferior direita da tela"
 
 #: ../src/gtkgui.glade.h:126
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed in"
-msgstr "Gajim notificará você através de um alerta visual na parte inferior direita da tela sobre os contatos que se conectaram"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed in"
+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:127
-msgid "Gajim will notify you via a popup window in the bottom right of the screen about contacts that just signed out"
-msgstr "Gajim notificará você através de um alerta visual na parte inferior direita da tela sobre os contatos que se desconectaram"
+msgid ""
+"Gajim will notify you via a popup window in the bottom right of the screen "
+"about contacts that just signed out"
+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:128
-msgid "Gajim will only change the icon of the contact that sent the new message"
+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:129
@@ -2078,48 +2076,92 @@ 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:144
-msgid "If checked, Gajim will broadcast capability to send and receive meta-information related to a conversation you may have with a contact such as composing a message"
-msgstr "Se marcado, o Gajim transmitirá os recursos para enviar e receber meta-informações relacionadas a conversação que você pode ter com um contato tal como escrever uma mensagem"
+msgid ""
+"If checked, Gajim will broadcast capability to send and receive meta-"
+"information related to a conversation you may have with a contact such as "
+"composing a message"
+msgstr ""
+"Se marcado, o Gajim transmitirá os recursos para enviar e receber meta-"
+"informações relacionadas a conversação que você pode ter com um contato tal "
+"como escrever uma mensagem"
 
 #: ../src/gtkgui.glade.h:145
 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"
+msgstr ""
+"Se marcado, o Gajim irá ingressar na conferência no ínicio da aplicação"
 
 #: ../src/gtkgui.glade.h:146
 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:147
-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 "Se marcado, o Gajim lembrará a posição e tamanho da janela principal na próxima vez que você executa-lo"
+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 ""
+"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:148
-msgid "If checked, Gajim will replace ascii smilies like ':)' with equivalent graphical emoticons"
-msgstr "Se marcado, o Gajim trocará carinhas em ascii ':)' pelo emoticon gráfico equivalente"
+msgid ""
+"If checked, Gajim will replace ascii smilies like ':)' with equivalent "
+"graphical emoticons"
+msgstr ""
+"Se marcado, o Gajim trocará carinhas em ascii ':)' pelo emoticon gráfico "
+"equivalente"
 
 #: ../src/gtkgui.glade.h:149
-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"
+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:150
-msgid "If checked, Gajim will store the password in ~/.gajim/config with 'read' permission only for only you and of course the administrator"
-msgstr "Se marcado, o Gajim gravará sua senha em ~/.gajim/config com permissão de 'leitura' somente para você e claro, o administrador"
+msgid ""
+"If checked, Gajim will store the password in ~/.gajim/config with 'read' "
+"permission only for only you and of course the administrator"
+msgstr ""
+"Se marcado, o Gajim gravará sua senha em ~/.gajim/config com permissão de "
+"'leitura' somente para você e claro, o administrador"
 
 #: ../src/gtkgui.glade.h:151
-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 "Se marcado, o Gajim usará ícones protocolo-específicos do status. (por exemplo, um contato do MSN terá o ícone equivalente do MSN para o status conectado, ausente, ocupado, etc....)"
+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 ""
+"Se marcado, o Gajim usará ícones protocolo-específicos do status. (por "
+"exemplo, um contato do MSN terá o ícone equivalente do MSN para o status "
+"conectado, ausente, ocupado, etc....)"
 
 #: ../src/gtkgui.glade.h:152
-msgid "If checked, Gajim, when launched, will automatically connect to jabber using this account"
-msgstr "Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber usando esta conta"
+msgid ""
+"If checked, Gajim, when launched, will automatically connect to jabber using "
+"this account"
+msgstr ""
+"Se marcado, o Gajim, quando carregado, conectará automaticamente ao jabber "
+"usando esta conta"
 
 #: ../src/gtkgui.glade.h:153
-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 "Se marcado, todas as janelas de bate-papo e conferências terão a área da informação no alto e a área dos botões embaixo escondidas. Você pode rapidamente alternar para a vista compacta com Alt+C. NOTA: O último estado que você deixa uma janela/aba não é permanente"
+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 ""
+"Se marcado, todas as janelas de bate-papo e conferências terão a área da "
+"informação no alto e a área dos botões embaixo escondidas. Você pode "
+"rapidamente alternar para a vista compacta com Alt+C. NOTA: O último estado "
+"que você deixa uma janela/aba não é permanente"
 
 #: ../src/gtkgui.glade.h:154
-msgid "If you have 2 or more accounts and it is checked, Gajim will list all contacts as if you had one account"
-msgstr "Se você tem duas ou mais contas e isto é marcado, Gajim listará todos os contatos como se você tivesse somente uma conta"
+msgid ""
+"If you have 2 or more accounts and it is checked, Gajim will list all "
+"contacts as if you had one account"
+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:155
 msgid "Incoming message:"
@@ -2306,8 +2348,14 @@ msgid "Priori_ty:"
 msgstr "_Prioridade"
 
 #: ../src/gtkgui.glade.h:209
-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 "Prioridade é usada no Jabber para determinar quem recebe os eventos do servidor jabber quando dois ou mais clientes estão conectados usando a mesma conta; O cliente com a maior prioridade receberá os eventos"
+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 ""
+"Prioridade é usada no Jabber para determinar quem recebe os eventos do "
+"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:210
 msgid "Profile, Avatar"
@@ -2347,7 +2395,9 @@ msgstr "Remover a transferência de arquivo da lista."
 
 #: ../src/gtkgui.glade.h:220
 msgid "Removes completed, canceled and failed file transfers from the list"
-msgstr "Remover transferências de arquivos completas, canceladas ou interrompidas da lista"
+msgstr ""
+"Remover transferências de arquivos completas, canceladas ou interrompidas da "
+"lista"
 
 #: ../src/gtkgui.glade.h:221
 msgid "Removing selected file transfer"
@@ -2366,8 +2416,18 @@ msgid "Resour_ce: "
 msgstr "_Recurso: "
 
 #: ../src/gtkgui.glade.h:225
-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 "Recurso é enviado ao servidor jabber com objetivo de 'separar' o mesmo JID em duas ou mais partes dependendo do número de clientes conectados no mesmo servidor com a mesma conta. Então você pode estar conectado na mesma conta com o recurso 'Casa' e 'Trabalho' ao mesmo tempo. O recurso que possuir a maior prioridade receberá os eventos. (veja abaixo)"
+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 ""
+"Recurso é enviado ao servidor jabber com objetivo de 'separar' o mesmo JID "
+"em duas ou mais partes dependendo do número de clientes conectados no mesmo "
+"servidor com a mesma conta. Então você pode estar conectado na mesma conta "
+"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:226
 msgid "Resource:"
@@ -2563,8 +2623,12 @@ msgid "Theme:"
 msgstr "Tema:"
 
 #: ../src/gtkgui.glade.h:275
-msgid "This action removes single file transfer from the list. If the transfer is active, it is first stopped and then removed"
-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."
+msgid ""
+"This action removes single file transfer from the list. If the transfer is "
+"active, it is first stopped and then removed"
+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:276
 msgid "Title:"
@@ -2631,8 +2695,14 @@ 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:292
-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 "Quando uma mensagem nova é recebida que não seja de um contato que já esteja numa janela de bate-papo, as três ações seguintes podem acontecer para que você seja informado sobre ela"
+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 ""
+"Quando uma mensagem nova é recebida que não seja de um contato que já esteja "
+"numa janela de bate-papo, as três ações seguintes podem acontecer para que "
+"você seja informado sobre ela"
 
 #: ../src/gtkgui.glade.h:293
 msgid "When new message is received"
@@ -2710,8 +2780,7 @@ msgstr "Visão _Compacta"
 msgid "_Compact View    Alt+C"
 msgstr "Visão _Compacta    Alt+C"
 
-#: ../src/gtkgui.glade.h:312
-#: ../src/filetransfers_window.py:627
+#: ../src/gtkgui.glade.h:312 ../src/filetransfers_window.py:627
 msgid "_Continue"
 msgstr "_Continuar"
 
@@ -2840,8 +2909,7 @@ msgstr "Ações de _Ocupantes"
 msgid "_Online Users"
 msgstr "Usuários C_onectados"
 
-#: ../src/gtkgui.glade.h:347
-#: ../src/filetransfers_window.py:171
+#: ../src/gtkgui.glade.h:347 ../src/filetransfers_window.py:171
 msgid "_Open Containing Folder"
 msgstr "_Abrir pasta do arquivo"
 
@@ -3001,107 +3069,99 @@ msgstr "lista de transferência de arquivos"
 msgid "minutes"
 msgstr "minutos"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
 msgstr[0] "Gajim - uma mensagem não lida"
 msgstr[1] "Gajim - %d mensagens não lidas"
 
-#: ../src/tooltips.py:240
-#: ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr "Regra: "
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr "Filiação: "
 
-#: ../src/tooltips.py:270
-#: ../src/tooltips.py:351
-#: ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:328
-#: ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Nome: "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Inscrição: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Recurso: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Tipo: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Download"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:404
-#: ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Remetente: "
 
-#: ../src/tooltips.py:409
-#: ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Destinatário: "
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Tamanho: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Transferido: "
 
-#: ../src/tooltips.py:430
-#: ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr "Não iniciado"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr "Parado"
 
-#: ../src/tooltips.py:436
-#: ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr "Completo"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr "Pausa"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr "Parado"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr "Transferindo"
 
@@ -3113,14 +3173,12 @@ msgstr "Arquivo"
 msgid "Progress"
 msgstr "Progresso"
 
-#: ../src/filetransfers_window.py:143
-#: ../src/filetransfers_window.py:214
+#: ../src/filetransfers_window.py:143 ../src/filetransfers_window.py:214
 #, python-format
 msgid "Filename: %s"
 msgstr "Nome do arquivo: %s"
 
-#: ../src/filetransfers_window.py:145
-#: ../src/filetransfers_window.py:274
+#: ../src/filetransfers_window.py:145 ../src/filetransfers_window.py:274
 #, python-format
 msgid "Size: %s"
 msgstr "Tamanho: %s"
@@ -3130,8 +3188,7 @@ msgstr "Tamanho: %s"
 msgid "You"
 msgstr "Você"
 
-#: ../src/filetransfers_window.py:155
-#: ../src/filetransfers_window.py:216
+#: ../src/filetransfers_window.py:155 ../src/filetransfers_window.py:216
 #, python-format
 msgid "Sender: %s"
 msgstr "Remetente: %s"
@@ -3145,13 +3202,11 @@ msgstr "Salvo em: %s"
 msgid "File transfer completed"
 msgstr "Transferência de arquivos completa"
 
-#: ../src/filetransfers_window.py:195
-#: ../src/filetransfers_window.py:203
+#: ../src/filetransfers_window.py:195 ../src/filetransfers_window.py:203
 msgid "File transfer canceled"
 msgstr "Transferência de arquivos cancelada"
 
-#: ../src/filetransfers_window.py:195
-#: ../src/filetransfers_window.py:204
+#: ../src/filetransfers_window.py:195 ../src/filetransfers_window.py:204
 msgid "Connection with peer cannot be established."
 msgstr "Conexão ponto a ponto peer não pôde ser estabelecida."
 
@@ -3228,13 +3283,15 @@ msgid "Popup a window with the next unread message"
 msgstr "Mostrar uma janela com a próxima mensagem não lida"
 
 #: ../scripts/gajim-remote.py:86
-msgid "Print a list of all contacts in the roster. Each contact appear on a separate line"
-msgstr "Imprimir uma lista de todos os contatos na lista. Cada contato aparecerá em uma linha separada"
+msgid ""
+"Print a list of all contacts in the roster. Each contact appear on a "
+"separate line"
+msgstr ""
+"Imprimir uma lista de todos os contatos na lista. Cada contato aparecerá em "
+"uma linha separada"
 
-#: ../scripts/gajim-remote.py:89
-#: ../scripts/gajim-remote.py:104
-#: ../scripts/gajim-remote.py:116
-#: ../scripts/gajim-remote.py:130
+#: ../scripts/gajim-remote.py:89 ../scripts/gajim-remote.py:104
+#: ../scripts/gajim-remote.py:116 ../scripts/gajim-remote.py:130
 #: ../scripts/gajim-remote.py:145
 msgid "account"
 msgstr "conta"
@@ -3257,10 +3314,10 @@ msgstr "status"
 
 #: ../scripts/gajim-remote.py:101
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível"
+msgstr ""
+"um desses: desconectado, conectado, bate-papo, inativo, fora, np, invisível"
 
-#: ../scripts/gajim-remote.py:103
-#: ../scripts/gajim-remote.py:127
+#: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
 msgid "message"
 msgstr "mensagem"
 
@@ -3269,12 +3326,19 @@ msgid "status message"
 msgstr "mensagem de status"
 
 #: ../scripts/gajim-remote.py:104
-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 "mudar status da conta \"account\". Se não especificado, tentará mudar o status de todas as contas existentes com a opção \"sincronizar com status global\" marcada"
+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 ""
+"mudar status da conta \"account\". Se não especificado, tentará mudar o "
+"status de todas as contas existentes com a opção \"sincronizar com status "
+"global\" marcada"
 
 #: ../scripts/gajim-remote.py:110
 msgid "Show the chat dialog so that you can send message to a contact"
-msgstr "Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um contato"
+msgstr ""
+"Mostrar o diálogo do bate-papo onde você pode enviar mensagens para um "
+"contato"
 
 #: ../scripts/gajim-remote.py:113
 msgid "JID of the contact that you want to chat with"
@@ -3285,8 +3349,14 @@ msgid "if specified, contact is taken from the contact list of this account"
 msgstr "se especificado, o contato é feito da lista de contatos desta conta"
 
 #: ../scripts/gajim-remote.py:121
-msgid "Send new message to a contact in the roster. Both OpenPGP key and account are optional. If you want to set only 'account', without 'OpenPGP key', just set 'OpenPGP key' to ''."
-msgstr "Envia nova mensagem para um contato na lista. Tanto a chave OpenPGP e a conta são opcionais. Se vc quer configurar somente a 'conta', sem a 'chave pgp', apenas configure a 'chave pgp' para ''."
+msgid ""
+"Send new message to a contact in the roster. Both OpenPGP key and account "
+"are optional. If you want to set only 'account', without 'OpenPGP key', just "
+"set 'OpenPGP key' to ''."
+msgstr ""
+"Envia nova mensagem para um contato na lista. Tanto a chave OpenPGP e a "
+"conta são opcionais. Se vc quer configurar somente a 'conta', sem a 'chave "
+"pgp', apenas configure a 'chave pgp' para ''."
 
 #: ../scripts/gajim-remote.py:125
 msgid "JID of the contact that will receive the message"
@@ -3302,7 +3372,8 @@ msgstr "chave pgp"
 
 #: ../scripts/gajim-remote.py:128
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "se especificada, a mensagem será criptografada usando esta chave pública"
+msgstr ""
+"se especificada, a mensagem será criptografada usando esta chave pública"
 
 #: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be sent using this account"
@@ -3312,8 +3383,7 @@ msgstr "se especificada, a mensagem será enviada usando esta conta"
 msgid "Get detailed info on a contact"
 msgstr "Informações detalhadas do contato"
 
-#: ../scripts/gajim-remote.py:137
-#: ../scripts/gajim-remote.py:144
+#: ../scripts/gajim-remote.py:137 ../scripts/gajim-remote.py:144
 msgid "JID of the contact"
 msgstr "JID do contato"
 
@@ -3337,8 +3407,7 @@ msgstr "se especificada, arquivo irá ser enviado usando esta conta"
 msgid "Missing argument \"contact_jid\""
 msgstr "Argumento não informado \"contact_jid\""
 
-#: ../scripts/gajim-remote.py:172
-#: ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Serviço não disponível"
 
@@ -3391,12 +3460,12 @@ msgstr ""
 "Uso: %s comando [argumentos]\n"
 "Comando é um desses:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Tipo desconhecido %s"
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3405,3 +3474,14 @@ msgstr ""
 "Argumento \"%s\" não está especificado. \n"
 "Tipo \"%s ajuda %s\" para maiores informações"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim desconectou você de %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "%s segundos se passaram e o servidor não respondeu ao nosso keep-alive. "
+#~ "Se você acredita em tal desconexão não deve ter acontecido, você pode "
+#~ "desabilitar o envio de pacotes keep-alive modificando esta conta."
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index ed177f8fc0446e5892d67b78b3f58acce40a0efd..07af1ed2580a7f74d9d6294485577efe27339a3a 100644
--- a/po/ru/LC_MESSAGES/gajim.po
+++ b/po/ru/LC_MESSAGES/gajim.po
@@ -13,14 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-26 01:15+0300\n"
+"POT-Creation-Date: 2005-08-30 01:36+0300\n"
 "PO-Revision-Date: 2005-08-27 02:25+0700\n"
 "Last-Translator: Yakov Bezrukov <nebulam51@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Generator: KBabel 1.10.1\n"
 
 #: ../src/common/config.py:51
@@ -31,59 +32,59 @@ msgstr "Статус 'Отошел' ввиду отсутствия пользо
 msgid "Not available as a result of being idle"
 msgstr "Статус 'Недоступен' ввиду отсутствия пользователя."
 
-#: ../src/common/config.py:278
+#: ../src/common/config.py:283
 msgid "Sleeping"
 msgstr "Сплю"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back soon"
 msgstr "Скоро буду"
 
-#: ../src/common/config.py:279
+#: ../src/common/config.py:284
 msgid "Back in some minutes."
 msgstr "Вернусь через несколько минут"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "Eating"
 msgstr "Ем"
 
-#: ../src/common/config.py:280
+#: ../src/common/config.py:285
 msgid "I'm eating, so leave me a message."
 msgstr "Я кушаю, так что оставьте сообщение секретарю."
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "Movie"
 msgstr "Я в кино"
 
-#: ../src/common/config.py:281
+#: ../src/common/config.py:286
 msgid "I'm watching a movie."
 msgstr "Я смотрю кино"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "Working"
 msgstr "Работаю"
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:287
 msgid "I'm working."
 msgstr "Я работаю"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../src/common/config.py:283
+#: ../src/common/config.py:288
 msgid "I'm on the phone."
 msgstr "Я говорю по телефону"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "Out"
 msgstr "Вышел"
 
-#: ../src/common/config.py:284
+#: ../src/common/config.py:289
 msgid "I'm out enjoying life"
 msgstr "Наслаждаюсь жизнью, чего и вам желаю."
 
-#: ../src/common/connection.py:280 ../src/common/connection.py:290
+#: ../src/common/connection.py:281 ../src/common/connection.py:291
 #, python-format
 msgid ""
 "Subject: %s\n"
@@ -92,7 +93,7 @@ msgstr ""
 "Тема: %s\n"
 "%s"
 
-#: ../src/common/connection.py:340 ../src/common/connection.py:1562
+#: ../src/common/connection.py:341 ../src/common/connection.py:1542
 msgid "I would like to add you to my roster."
 msgstr "Вы не возражаете, если я добавлю Вас в свой ростер?"
 
@@ -130,86 +131,69 @@ msgstr "Связь с аккаунтом \"%s\" была потеряна"
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "Требуется переподключение для продолжения приема и отправки сообщений."
 
-#: ../src/common/connection.py:1201
+#: ../src/common/connection.py:1179
 msgid "Error:"
 msgstr "Ошибка: "
 
-#: ../src/common/connection.py:1268 ../src/common/connection.py:1329
-#: ../src/common/connection.py:1664
+#: ../src/common/connection.py:1246 ../src/common/connection.py:1307
+#: ../src/common/connection.py:1644
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Не могу соединиться с \"%s\""
 
-#: ../src/common/connection.py:1269 ../src/common/connection.py:1330
+#: ../src/common/connection.py:1247 ../src/common/connection.py:1308
 msgid "Check your connection or try again later"
 msgstr "Проверьте настройки сети или попробуйте еще раз позже"
 
-#: ../src/common/connection.py:1272 ../src/common/connection.py:1667
+#: ../src/common/connection.py:1250 ../src/common/connection.py:1647
 #, python-format
 msgid "Connected to server with %s"
 msgstr "Подключен к серверу с %s"
 
-#: ../src/common/connection.py:1342
+#: ../src/common/connection.py:1320
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Ошибка аутентификации с \"%s\""
 
-#: ../src/common/connection.py:1343
+#: ../src/common/connection.py:1321
 msgid "Please check your login and password for correctness."
 msgstr "Пожалуйста, проверьте правильность логина и пароля."
 
-#: ../src/common/connection.py:1424
+#: ../src/common/connection.py:1402
 msgid "invisible"
 msgstr "невидимка"
 
 #. do not show I'm invisible!
-#: ../src/common/connection.py:1425
+#: ../src/common/connection.py:1403
 msgid "offline"
 msgstr "отключен"
 
-#: ../src/common/connection.py:1426 ../src/roster_window.py:1275
+#: ../src/common/connection.py:1404 ../src/roster_window.py:1250
 #, python-format
 msgid "I'm %s"
 msgstr "Я %s"
 
 #. We didn't set a passphrase
-#: ../src/common/connection.py:1431
+#: ../src/common/connection.py:1409
 msgid "OpenPGP passphrase was not given"
 msgstr "Не задана парольная фраза OpenPGP"
 
 #. %s is the account name here
-#: ../src/common/connection.py:1433
+#: ../src/common/connection.py:1411
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Вы будете подключены к %s без использования OpenPGP."
 
 #. we're not english
-#: ../src/common/connection.py:1524
+#: ../src/common/connection.py:1504
 msgid "[This message is encrypted]"
 msgstr "[Это сообщения зашифровано]"
 
-#: ../src/common/connection.py:1665 ../src/gajim.py:527
+#: ../src/common/connection.py:1645 ../src/gajim.py:528
 msgid "Check your connection or try again later."
 msgstr "Проверьте настройки сети или попробуйте еще раз позже."
 
-#. disconnect if no answer
-#: ../src/common/connection.py:1947
-#, python-format
-msgid "Gajim disconnected you from %s"
-msgstr "Gajim отсоединился от %s"
-
-#: ../src/common/connection.py:1948
-#, python-format
-msgid ""
-"%s seconds have passed and server did not reply to our keep-alive. If you "
-"believe such disconnection should not have happened, you can disable sending "
-"keep-alive packets by modifying this account."
-msgstr ""
-"Прошло %s секунд(а) и сервер не ответил на пинг. Если вы считаете,что сервер "
-"работает нормально и этого не должно было случиться, то вы можете отключить "
-"функцию отсылки пингов в настройках этого аккаунта."
-
-#: ../src/common/connection.py:1954 ../src/common/connection.py:1963
+#: ../src/common/connection.py:1920 ../src/common/connection.py:1929
 msgid "error appeared while processing xmpp:"
 msgstr "произошла ошибка при обработке xmpp:"
 
@@ -393,14 +377,14 @@ msgstr "создается директория %s"
 
 #. we talk about a file
 #. we talk about file
-#: ../src/common/optparser.py:51 ../src/gtkgui_helpers.py:62
-#: ../src/gtkgui_helpers.py:77
+#: ../src/common/optparser.py:52 ../src/gtkgui_helpers.py:68
+#: ../src/gtkgui_helpers.py:83
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "ошибка: не могу открыть %s для чтения"
 
 #. chances are we cannot write file in a directory
-#: ../src/common/optparser.py:78
+#: ../src/common/optparser.py:93
 #, python-format
 msgid "Unable to write file in %s"
 msgstr "Не могу записать файл в %s"
@@ -417,37 +401,37 @@ msgstr "Значение"
 msgid "Type"
 msgstr "Тип"
 
-#: ../src/chat.py:123 ../src/gtkgui.glade.h:70
+#: ../src/chat.py:141 ../src/gtkgui.glade.h:70
 msgid "Chat"
 msgstr "Чат"
 
-#: ../src/chat.py:125 ../src/gtkgui.glade.h:134
+#: ../src/chat.py:143 ../src/gtkgui.glade.h:134
 msgid "Group Chat"
 msgstr "Комната"
 
 #. if we have 2 or more accounts
-#: ../src/chat.py:139
+#: ../src/chat.py:157
 msgid "account: "
 msgstr "аккаунт: "
 
 #. Groups maynot change name from or to 'not in the roster'
-#: ../src/chat.py:242 ../src/chat.py:911 ../src/dialogs.py:113
-#: ../src/dialogs.py:319 ../src/dialogs.py:884 ../src/dialogs.py:885
-#: ../src/gajim.py:486 ../src/gajim.py:487 ../src/roster_window.py:835
-#: ../src/roster_window.py:1051 ../src/roster_window.py:1189
-#: ../src/roster_window.py:1378 ../src/roster_window.py:1412
-#: ../src/roster_window.py:1736 ../src/roster_window.py:1933
-#: ../src/roster_window.py:1935 ../src/roster_window.py:2008
+#: ../src/chat.py:267 ../src/chat.py:937 ../src/dialogs.py:113
+#: ../src/dialogs.py:321 ../src/dialogs.py:897 ../src/dialogs.py:898
+#: ../src/gajim.py:487 ../src/gajim.py:488 ../src/roster_window.py:808
+#: ../src/roster_window.py:1024 ../src/roster_window.py:1164
+#: ../src/roster_window.py:1353 ../src/roster_window.py:1387
+#: ../src/roster_window.py:1712 ../src/roster_window.py:1911
+#: ../src/roster_window.py:1913 ../src/roster_window.py:1987
 msgid "not in the roster"
 msgstr "не в ростере"
 
-#: ../src/chat.py:293
+#: ../src/chat.py:318
 #, python-format
 msgid "Switch to %s"
 msgstr "Переключиться на %s"
 
 #. FIXME: add a ui for this use spell.set_language()
-#: ../src/chat.py:493
+#: ../src/chat.py:519
 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 "
@@ -464,37 +448,37 @@ msgstr ""
 "\n"
 "Выделение слов с опечатками выключено"
 
-#: ../src/chat.py:752
+#: ../src/chat.py:778
 #, python-format
 msgid "Actions for \"%s\""
 msgstr "Действия для \"%s\""
 
-#: ../src/chat.py:764
+#: ../src/chat.py:790
 msgid "Read _Wikipedia Article"
 msgstr "Смотреть статью в _Wikipedia"
 
-#: ../src/chat.py:768
+#: ../src/chat.py:794
 msgid "Look it up in _Dictionary"
 msgstr "Искать в _Dictionary"
 
 #. we must have %s in the url if not WIKTIONARY
-#: ../src/chat.py:783
+#: ../src/chat.py:809
 #, 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/chat.py:794
+#: ../src/chat.py:820
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL Web-поиска отсутствует в \"%s\""
 
-#: ../src/chat.py:797
+#: ../src/chat.py:823
 msgid "Web _Search for it"
 msgstr "_Поиск по Web"
 
 #. if we have subject, show it too!
-#: ../src/chat.py:1132
+#: ../src/chat.py:1159
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Тема: %s\n"
@@ -528,7 +512,7 @@ msgstr "текст сообщение сервера"
 msgid "Choose Sound"
 msgstr "Выберите Звуковой Файл"
 
-#: ../src/config.py:1004 ../src/config.py:1963 ../src/vcard.py:132
+#: ../src/config.py:1004 ../src/config.py:1964 ../src/vcard.py:132
 msgid "All files"
 msgstr "Все файлы"
 
@@ -568,7 +552,7 @@ msgstr "Неверный Jabber ID"
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Jabber ID должен иметь формат \"имя_пользователя@сервер\"."
 
-#: ../src/config.py:1226 ../src/dialogs.py:748
+#: ../src/config.py:1226 ../src/dialogs.py:761
 msgid "Invalid password"
 msgstr "Неверный пароль"
 
@@ -598,16 +582,18 @@ msgstr "Такой аккаунт недоступен"
 
 #: ../src/config.py:1422
 msgid "You must create your account before editing your personal information."
-msgstr "Перед редактированием личных данных необходимо сначала создать аккаунт."
+msgstr ""
+"Перед редактированием личных данных необходимо сначала создать аккаунт."
 
-#: ../src/config.py:1429 ../src/config.py:2047 ../src/dialogs.py:622
-#: ../src/dialogs.py:728 ../src/vcard.py:375 ../src/vcard.py:403
+#: ../src/config.py:1429 ../src/config.py:2048 ../src/dialogs.py:635
+#: ../src/dialogs.py:741 ../src/vcard.py:376 ../src/vcard.py:404
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
 #: ../src/config.py:1430
 msgid "Without a connection, you can not edit your personal information."
-msgstr "Чтобы отредактировать личную информацию нужно подсоединиться к серверу."
+msgstr ""
+"Чтобы отредактировать личную информацию нужно подсоединиться к серверу."
 
 #: ../src/config.py:1457
 msgid "Failed to get secret keys"
@@ -629,7 +615,7 @@ msgstr "Выберите свой OpenPGP ключ"
 msgid "No key selected"
 msgstr "Не выбран ключ"
 
-#: ../src/config.py:1701 ../src/config.py:2070
+#: ../src/config.py:1701 ../src/config.py:2071
 msgid "Name"
 msgstr "Имя"
 
@@ -638,11 +624,11 @@ msgid "Server"
 msgstr "Сервер"
 
 #. if not '@' or '@' starts the jid ==> agent
-#: ../src/config.py:1809 ../src/config.py:2289 ../src/dialogs.py:113
-#: ../src/dialogs.py:283 ../src/dialogs.py:319 ../src/roster_window.py:124
+#: ../src/config.py:1809 ../src/config.py:2290 ../src/dialogs.py:113
+#: ../src/dialogs.py:285 ../src/dialogs.py:321 ../src/roster_window.py:124
 #: ../src/roster_window.py:129 ../src/roster_window.py:153
-#: ../src/roster_window.py:1929 ../src/roster_window.py:1931
-#: ../src/roster_window.py:2008 ../src/systray.py:217
+#: ../src/roster_window.py:1907 ../src/roster_window.py:1909
+#: ../src/roster_window.py:1987 ../src/systray.py:225
 msgid "Transports"
 msgstr "Транспорты"
 
@@ -664,82 +650,83 @@ msgstr "Текст"
 msgid "Image"
 msgstr "Картинка"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid "Image is too big"
 msgstr "Размер картинки слишком велика"
 
-#: ../src/config.py:1901
+#: ../src/config.py:1902
 msgid ""
 "Image for emoticon has to be less than or equal to 24 pixels in width and 24 "
 "in height."
 msgstr "Картинка для смайлика должна быть не больше чем 24х24 пикселя."
 
-#: ../src/config.py:1951
+#: ../src/config.py:1952
 msgid "Choose Image"
 msgstr "Выбрать Картинку"
 
-#: ../src/config.py:1968 ../src/vcard.py:137
+#: ../src/config.py:1969 ../src/vcard.py:137
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/config.py:2048
+#: ../src/config.py:2049
 msgid "Without a connection, you can not browse available services"
 msgstr "Для просмотра сервисов необходимо сначала подсоединиться к серверу"
 
-#: ../src/config.py:2053
+#: ../src/config.py:2054
 #, python-format
 msgid "Service Discovery using %s account"
 msgstr "Обзор Сервисов для аккаунта %s"
 
-#: ../src/config.py:2055
+#: ../src/config.py:2056
 msgid "Service Discovery"
 msgstr "Обзор Сервисов"
 
-#: ../src/config.py:2075
+#: ../src/config.py:2076
 msgid "Service"
 msgstr "Сервис"
 
-#: ../src/config.py:2080
+#: ../src/config.py:2081
 msgid "Node"
 msgstr "Узел"
 
-#: ../src/config.py:2292 ../src/gtkgui.glade.h:317
+#: ../src/config.py:2293 ../src/gtkgui.glade.h:317
 msgid "_Edit"
 msgstr "_Редактировать"
 
-#: ../src/config.py:2294 ../src/gtkgui.glade.h:213
+#: ../src/config.py:2295 ../src/gtkgui.glade.h:213
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/config.py:2466
+#: ../src/config.py:2467
 #, python-format
 msgid "Removing %s account"
 msgstr "Удаление аккаунта %s"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2474
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Аккаунт \"%s\" подключен к серверу"
 
-#: ../src/config.py:2474
+#: ../src/config.py:2475
 msgid "If you remove it, the connection will be lost."
 msgstr "Если вы удалите его, произойдет отключение."
 
-#: ../src/config.py:2601
+#: ../src/config.py:2602
 msgid "New Room"
 msgstr "Новая Комната"
 
-#: ../src/config.py:2631
+#: ../src/config.py:2632
 msgid "This bookmark has invalid data"
 msgstr "Эта закладка содержит неверные данные"
 
-#: ../src/config.py:2632
-msgid "Please be sure to fill out server and room fields or remove this bookmark."
+#: ../src/config.py:2633
+msgid ""
+"Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Пожалуйста, удостоверьтесь что заполнены поля с именем сервера и комнаты "
 "либо удалите эту закладку."
 
-#: ../src/config.py:2852
+#: ../src/config.py:2854
 msgid ""
 "Account has been added successfully.\n"
 "You can set advanced options by using \"Edit->Accounts\" from the main "
@@ -749,7 +736,7 @@ msgstr ""
 "Вы можете настроить аккаунт используя \n"
 "\"Настройка->Аккаунты\" из главного окна."
 
-#: ../src/config.py:2863
+#: ../src/config.py:2865
 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 "
@@ -759,11 +746,11 @@ msgstr ""
 "Вы можете настроить аккаунт используя \n"
 "\"Настройка->Аккаунты\" из главного окна."
 
-#: ../src/config.py:2877
+#: ../src/config.py:2879
 msgid "You need to enter a username to add an account."
 msgstr "Для добавления аккаунта необходимо ввести имя пользователя."
 
-#: ../src/config.py:2881
+#: ../src/config.py:2883
 msgid "You need to enter a valid server address to add an account."
 msgstr "Для регистрации аккаунта необходимо ввести адрес сервера."
 
@@ -791,195 +778,195 @@ msgstr "В группе должен быть как минимум один а
 msgid "Group"
 msgstr "Группа"
 
-#: ../src/dialogs.py:127
+#: ../src/dialogs.py:128
 msgid "In the group"
 msgstr "В группе"
 
-#: ../src/dialogs.py:175
+#: ../src/dialogs.py:177
 msgid "KeyID"
 msgstr "KeyID"
 
-#: ../src/dialogs.py:178
+#: ../src/dialogs.py:180
 msgid "Contact name"
 msgstr "Имя контакта"
 
-#: ../src/dialogs.py:209
+#: ../src/dialogs.py:211
 #, python-format
 msgid "%s Status Message"
 msgstr "Сообщение о Статусе %s"
 
-#: ../src/dialogs.py:272
+#: ../src/dialogs.py:274
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Пожалуйста, заполните данные о вашем уже существующем аккаунте %s"
 
-#: ../src/dialogs.py:274
+#: ../src/dialogs.py:276
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Пожалуйста, заполните данные для аккаунта который вы хотите добавить"
 
-#: ../src/dialogs.py:340
+#: ../src/dialogs.py:350
 msgid "Invalid user name"
 msgstr "Неверное имя пользователя"
 
-#: ../src/dialogs.py:341
+#: ../src/dialogs.py:351
 msgid "Contact names must be of the form \"user@servername\"."
 msgstr "Контакт должен быть в формате \"имя_пользователя@сервер\"."
 
-#: ../src/dialogs.py:395
+#: ../src/dialogs.py:405
 msgid "Gajim - a GTK+ Jabber client"
 msgstr "Gajim - Jabber-клиент на GTK+"
 
-#: ../src/dialogs.py:396
+#: ../src/dialogs.py:406
 #, python-format
 msgid "Version %s"
 msgstr "Версия %s"
 
-#: ../src/dialogs.py:407
+#: ../src/dialogs.py:417
 msgid "A GTK jabber client"
 msgstr "Jabber-клиент на GTK"
 
-#: ../src/dialogs.py:416
+#: ../src/dialogs.py:426
 msgid "translator-credits"
 msgstr "переводчики"
 
-#: ../src/dialogs.py:577
+#: ../src/dialogs.py:590
 #, python-format
 msgid "Subscription request for account %s from %s"
 msgstr "Запрос на подписку для аккаунта %s от %s"
 
-#: ../src/dialogs.py:580
+#: ../src/dialogs.py:593
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Запрос на подписку от %s"
 
-#: ../src/dialogs.py:623
+#: ../src/dialogs.py:636
 msgid "You can not join a group chat unless you are connected."
 msgstr "Вы не можете зайти в комнату без подключения."
 
-#: ../src/dialogs.py:636
+#: ../src/dialogs.py:649
 #, python-format
 msgid "Join Group Chat as %s"
 msgstr "Войти в Комнату как %s"
 
-#: ../src/dialogs.py:638 ../src/gtkgui.glade.h:162
+#: ../src/dialogs.py:651 ../src/gtkgui.glade.h:162
 msgid "Join Group Chat"
 msgstr "Войти в Комнату"
 
-#: ../src/dialogs.py:701
+#: ../src/dialogs.py:714
 #, python-format
 msgid "New Message as %s"
 msgstr "Новое Сообщение как %s"
 
-#: ../src/dialogs.py:703 ../src/dialogs.py:798 ../src/gajim.py:415
+#: ../src/dialogs.py:716 ../src/dialogs.py:811 ../src/gajim.py:416
 #: ../src/gtkgui.glade.h:179
 msgid "New Message"
 msgstr "Новое Сообшение"
 
-#: ../src/dialogs.py:704
+#: ../src/dialogs.py:717
 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:712 ../src/dialogs.py:1025 ../src/dialogs.py:1146
+#: ../src/dialogs.py:725 ../src/dialogs.py:1038 ../src/dialogs.py:1159
 msgid "Connection not available"
 msgstr "Соединение невозможно"
 
-#: ../src/dialogs.py:713 ../src/dialogs.py:1026 ../src/dialogs.py:1147
+#: ../src/dialogs.py:726 ../src/dialogs.py:1039 ../src/dialogs.py:1160
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Пожалуйста, удостоверьтесь что вы подключены к \"%s\"."
 
 #. if no @ was given
-#: ../src/dialogs.py:718 ../src/dialogs.py:1040
+#: ../src/dialogs.py:731 ../src/dialogs.py:1053
 msgid "Invalid contact ID"
 msgstr "Неверный ID контакта"
 
-#: ../src/dialogs.py:719 ../src/dialogs.py:1041
+#: ../src/dialogs.py:732 ../src/dialogs.py:1054
 msgid "Contact ID must be of the form \"username@servername\"."
 msgstr "ID контакта должен быть в формате \"имя_пользователя@сервер\"."
 
-#: ../src/dialogs.py:729
+#: ../src/dialogs.py:742
 msgid "Without a connection, you can not change your password."
 msgstr "Для изменения пароль необходимо подсоединиться к серверу."
 
-#: ../src/dialogs.py:749
+#: ../src/dialogs.py:762
 msgid "You must enter a password."
 msgstr "Вы должны ввести пароль."
 
-#: ../src/dialogs.py:753
+#: ../src/dialogs.py:766
 msgid "Passwords do not match"
 msgstr "Пароли не совпадают"
 
-#: ../src/dialogs.py:754
+#: ../src/dialogs.py:767
 msgid "The passwords typed in both fields must be identical."
 msgstr "Пароли, введенные в оба поля должны быть одинаковы."
 
-#: ../src/dialogs.py:790 ../src/gajim.py:313
+#: ../src/dialogs.py:803 ../src/gajim.py:313
 msgid "Contact Signed In"
 msgstr "Контакт В Сети"
 
-#: ../src/dialogs.py:794 ../src/gajim.py:338
+#: ../src/dialogs.py:807 ../src/gajim.py:338
 msgid "Contact Signed Out"
 msgstr "Контакт Отключился"
 
-#: ../src/dialogs.py:799 ../src/gajim.py:412
+#: ../src/dialogs.py:812 ../src/gajim.py:413
 msgid "New Single Message"
 msgstr "Новое сообшение"
 
-#: ../src/dialogs.py:803 ../src/dialogs.py:808 ../src/dialogs.py:824
+#: ../src/dialogs.py:816 ../src/dialogs.py:821 ../src/dialogs.py:837
 #, python-format
 msgid "From %s"
 msgstr "От %s"
 
-#: ../src/dialogs.py:804
+#: ../src/dialogs.py:817
 msgid "File Transfer Request"
 msgstr "Запрос Передачи"
 
-#: ../src/dialogs.py:810 ../src/gajim.py:706 ../src/gajim.py:726
+#: ../src/dialogs.py:823 ../src/gajim.py:707 ../src/gajim.py:727
 msgid "File Transfer Error"
 msgstr "Ошибка Передачи"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:783
+#: ../src/dialogs.py:827 ../src/gajim.py:784
 msgid "File Transfer Completed"
 msgstr "Передача Файла Завершена"
 
-#: ../src/dialogs.py:814 ../src/gajim.py:786
+#: ../src/dialogs.py:827 ../src/gajim.py:787
 msgid "File Transfer Stopped"
 msgstr "Передача остановлена"
 
-#: ../src/dialogs.py:833
+#: ../src/dialogs.py:846
 #, python-format
 msgid "To %s"
 msgstr "К %s"
 
-#: ../src/dialogs.py:990
+#: ../src/dialogs.py:1003
 #, python-format
 msgid "Single Message as %s"
 msgstr "Новое Сообщение как %s"
 
-#: ../src/dialogs.py:992
+#: ../src/dialogs.py:1005
 msgid "Single Message"
 msgstr "Сообщение"
 
-#: ../src/dialogs.py:995
+#: ../src/dialogs.py:1008
 #, python-format
 msgid "Send %s"
 msgstr "Отправить %s"
 
-#: ../src/dialogs.py:1004
+#: ../src/dialogs.py:1017
 #, 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:1056
+#: ../src/dialogs.py:1069
 #, python-format
 msgid "RE: %s"
 msgstr "RE: %s"
 
-#: ../src/dialogs.py:1057
+#: ../src/dialogs.py:1070
 #, python-format
 msgid ""
 "\n"
@@ -994,26 +981,26 @@ msgstr ""
 "== Исходное Сообщение ==\n"
 "%s"
 
-#: ../src/dialogs.py:1098
+#: ../src/dialogs.py:1111
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML Консоль для %s"
 
-#: ../src/dialogs.py:1100
+#: ../src/dialogs.py:1113
 msgid "XML Console"
 msgstr "XML Консоль"
 
-#: ../src/dialogs.py:1186 ../src/gtkgui.glade.h:315
+#: ../src/dialogs.py:1199 ../src/gtkgui.glade.h:315
 msgid "_Deny"
 msgstr "_Отклонить"
 
 #. FIXME: add pano markup
-#: ../src/dialogs.py:1206
+#: ../src/dialogs.py:1219
 #, python-format
 msgid "You have been invited to the %s room by %s"
 msgstr "Вас в комнату %s приглашает %s"
 
-#: ../src/dialogs.py:1208
+#: ../src/dialogs.py:1221
 #, python-format
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
@@ -1028,58 +1015,58 @@ msgstr "HTTP (%s) Авторизация для %s"
 msgid "Do you accept this request?"
 msgstr "Вы принимаете этот запрос?"
 
-#: ../src/gajim.py:463
+#: ../src/gajim.py:464
 msgid "error while sending"
 msgstr "ошибка при отправке"
 
-#: ../src/gajim.py:489 ../src/gajim.py:499 ../src/roster_window.py:126
-#: ../src/roster_window.py:1038 ../src/gtkgui.glade.h:130
+#: ../src/gajim.py:490 ../src/gajim.py:500 ../src/roster_window.py:126
+#: ../src/roster_window.py:1011 ../src/gtkgui.glade.h:130
 msgid "General"
 msgstr "Общие"
 
-#: ../src/gajim.py:503
+#: ../src/gajim.py:504
 msgid "Authorization accepted"
 msgstr "Авторизация принята"
 
-#: ../src/gajim.py:504
+#: ../src/gajim.py:505
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his status."
 msgstr "Контакт \"%s\" авторизовал вас, теперь вы можете видеть его статус."
 
-#: ../src/gajim.py:510
+#: ../src/gajim.py:511
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Контакт \"%s\" отозвал подписку с вами"
 
-#: ../src/gajim.py:511
+#: ../src/gajim.py:512
 msgid "You will always see him as offline."
 msgstr "Вы всегда будете видеть его в оффлайне."
 
-#: ../src/gajim.py:526
+#: ../src/gajim.py:527
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Связь с \"%s\" не может быть установлена"
 
-#: ../src/gajim.py:544
+#: ../src/gajim.py:545
 msgid "Account registration successful"
 msgstr "Успешная регистрация аккаунта"
 
-#: ../src/gajim.py:545
+#: ../src/gajim.py:546
 #, python-format
 msgid "The account \"%s\" has been registered with the Jabber server."
 msgstr "Аккаунт \"%s\" был зарегистрирован на Jabber сервере."
 
-#: ../src/gajim.py:662
+#: ../src/gajim.py:663
 msgid "Your passphrase is incorrect"
 msgstr "Ваша парольная фраза неверна"
 
-#: ../src/gajim.py:663
+#: ../src/gajim.py:664
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Вы сейчас соединены без OpenPGP ключа."
 
 #. it is good to notify the user
 #. in case he cannot see the output of the console
-#: ../src/gajim.py:1009
+#: ../src/gajim.py:1010
 msgid "Cannot save your preferences"
 msgstr "Не могу сохранить ваши настройки"
 
@@ -1087,15 +1074,15 @@ msgstr "Не могу сохранить ваши настройки"
 msgid "Theme"
 msgstr "Тема"
 
-#: ../src/gajim_themes_window.py:125 ../src/gajim_themes_window.py:127
+#: ../src/gajim_themes_window.py:126 ../src/gajim_themes_window.py:128
 msgid "theme name"
 msgstr "имя тeмы"
 
-#: ../src/gajim_themes_window.py:128
+#: ../src/gajim_themes_window.py:129
 msgid "theme_name"
 msgstr "имя_тeмы"
 
-#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:969
+#: ../src/groupchat_window.py:127 ../src/groupchat_window.py:965
 #, python-format
 msgid "You just received a new message in room \"%s\""
 msgstr "Вы только что получили сообщение в комнате \"%s\""
@@ -1104,7 +1091,9 @@ msgstr "Вы только что получили сообщение в комн
 msgid ""
 "If you close this window and you have history disabled, this message will be "
 "lost."
-msgstr "Если вы закроете окно и у вас отключена функция ведения истории сообщений, то это сообщение будет потеряно."
+msgstr ""
+"Если вы закроете окно и у вас отключена функция ведения истории сообщений, "
+"то это сообщение будет потеряно."
 
 #: ../src/groupchat_window.py:143
 #, python-format
@@ -1116,7 +1105,8 @@ msgstr[2] ""
 
 #: ../src/groupchat_window.py:148
 msgid "If you close this window, you will be disconnected from this room."
-msgid_plural "If you close this window, you will be disconnected from these rooms."
+msgid_plural ""
+"If you close this window, you will be disconnected from these rooms."
 msgstr[0] "Если вы закроете это окно, то вы выйдете из этой комнаты."
 msgstr[1] "Если вы закроете это окно, то вы выйдете из этих комнат."
 msgstr[2] ""
@@ -1189,26 +1179,28 @@ msgid "You can manage your bookmarks via Actions menu in your roster."
 msgstr "Вы можете управлять закладками через меню \"Действия\" в ростере."
 
 #. ask for reason
-#: ../src/groupchat_window.py:721
+#: ../src/groupchat_window.py:717
 #, python-format
 msgid "Kicking %s"
 msgstr "Кикнуть %s"
 
-#: ../src/groupchat_window.py:722 ../src/groupchat_window.py:753
+#: ../src/groupchat_window.py:718 ../src/groupchat_window.py:749
 msgid "You may specify a reason below:"
 msgstr "Вы можете указать причину ниже:"
 
 #. ask for reason
-#: ../src/groupchat_window.py:752
+#: ../src/groupchat_window.py:748
 #, python-format
 msgid "Banning %s"
 msgstr "Забанить %s"
 
-#: ../src/groupchat_window.py:970 ../src/tabbed_chat_window.py:343
+#: ../src/groupchat_window.py:966 ../src/tabbed_chat_window.py:344
 msgid ""
 "If you close this tab and you have history disabled, the message will be "
 "lost."
-msgstr "Если вы закроете эту вкладку и у вас отключена функция ведения истории сообщений, то  сообщение будет потеряно."
+msgstr ""
+"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+"сообщений, то  сообщение будет потеряно."
 
 #: ../src/history_window.py:138
 #, python-format
@@ -1241,110 +1233,112 @@ msgstr "D-Bus сервер недоступен"
 msgid "D-Bus is not present on this machine"
 msgstr "На машине отсутствует D-Bus"
 
-#: ../src/roster_window.py:265
+#: ../src/roster_window.py:237
 #, python-format
 msgid "You are already in room %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/roster_window.py:416
+#: ../src/roster_window.py:388
 msgid "New _Room"
 msgstr "Новая _Комната"
 
-#: ../src/roster_window.py:431
+#: ../src/roster_window.py:403
 msgid "Manage Bookmarks..."
 msgstr "Управление Закладками..."
 
-#: ../src/roster_window.py:446
+#: ../src/roster_window.py:418
 #, python-format
 msgid "to %s account"
 msgstr "аккаунту %s"
 
-#: ../src/roster_window.py:458
+#: ../src/roster_window.py:430
 #, python-format
 msgid "using %s account"
 msgstr "используя %s аккаунт"
 
-#: ../src/roster_window.py:474
+#: ../src/roster_window.py:446
 #, python-format
 msgid "as %s"
 msgstr "как %s"
 
-#: ../src/roster_window.py:485
+#: ../src/roster_window.py:457
 #, python-format
 msgid "for account %s"
 msgstr "для аккаунта %s"
 
-#: ../src/roster_window.py:629
+#: ../src/roster_window.py:601
 #, python-format
 msgid "%s is now %s (%s)"
 msgstr "%s %s (%s)"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Транспорт \"%s\" будет удален"
 
-#: ../src/roster_window.py:704
+#: ../src/roster_window.py:676
 #, python-format
-msgid "You will no longer be able to send and receive messages to contacts from %s."
-msgstr "У вас теперь не будет возможности приема и отправки сообщения контактам с %s."
+msgid ""
+"You will no longer be able to send and receive messages to contacts from %s."
+msgstr ""
+"У вас теперь не будет возможности приема и отправки сообщения контактам с %s."
 
-#: ../src/roster_window.py:747
+#: ../src/roster_window.py:719
 msgid "Assign OpenPGP Key"
 msgstr "Назначить OpenPGP Ключ"
 
-#: ../src/roster_window.py:748
+#: ../src/roster_window.py:720
 msgid "Select a key to apply to the contact"
 msgstr "Выберите ключ который будет применен к контакту"
 
-#: ../src/roster_window.py:851
+#: ../src/roster_window.py:824
 msgid "I would like to add you to my roster"
 msgstr "Вы не против если я добавлю Вас себе в ростер?"
 
-#: ../src/roster_window.py:879
+#: ../src/roster_window.py:852
 msgid "Rename"
 msgstr "Переименовать"
 
-#: ../src/roster_window.py:900
+#: ../src/roster_window.py:873
 msgid "_Log on"
 msgstr "_Соединиться"
 
-#: ../src/roster_window.py:909
+#: ../src/roster_window.py:882
 msgid "Log _off"
 msgstr "_Отключиться"
 
-#: ../src/roster_window.py:921
+#: ../src/roster_window.py:894
 msgid "Edit"
 msgstr "Редактировать"
 
-#: ../src/roster_window.py:927 ../src/gtkgui.glade.h:364
+#: ../src/roster_window.py:900 ../src/gtkgui.glade.h:364
 msgid "_Remove from Roster"
 msgstr "_Удалить из Ростера"
 
-#: ../src/roster_window.py:1029
+#: ../src/roster_window.py:1002
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1030
+#: ../src/roster_window.py:1003
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1052
+#: ../src/roster_window.py:1025
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1053
+#: ../src/roster_window.py:1026
 #, python-format
 msgid "If \"%s\" accepts this request you will know his status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его статус"
 
-#: ../src/roster_window.py:1180
+#: ../src/roster_window.py:1155
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:1181
+#: ../src/roster_window.py:1156
 #, python-format
 msgid ""
 "By removing this contact you also remove authorization. Contact \"%s\" will "
@@ -1353,45 +1347,45 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Контакт \"%s\" "
 "будет всегда видеть вас так как будто вы в оффлайне."
 
-#: ../src/roster_window.py:1213
+#: ../src/roster_window.py:1188
 msgid "Password Required"
 msgstr "Требуется Пароль"
 
-#: ../src/roster_window.py:1214
+#: ../src/roster_window.py:1189
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для аккаунта %s"
 
-#: ../src/roster_window.py:1215
+#: ../src/roster_window.py:1190
 msgid "Save password"
 msgstr "Сохранить пароль"
 
-#: ../src/roster_window.py:1245
+#: ../src/roster_window.py:1220
 msgid "Passphrase Required"
 msgstr "Требуется Парольная Фраза"
 
-#: ../src/roster_window.py:1246
+#: ../src/roster_window.py:1221
 #, python-format
 msgid "Enter GPG key passphrase for account %s"
 msgstr "Введите парольную фразу GPG ключа для %s"
 
-#: ../src/roster_window.py:1247
+#: ../src/roster_window.py:1222
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:1294
+#: ../src/roster_window.py:1269
 msgid "No account available"
 msgstr "Недоступен"
 
-#: ../src/roster_window.py:1295
+#: ../src/roster_window.py:1270
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Для начала беседа прежде необходимо создать аккаунт."
 
-#: ../src/roster_window.py:1598 ../src/roster_window.py:1604
+#: ../src/roster_window.py:1573 ../src/roster_window.py:1579
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:1599 ../src/roster_window.py:1605
+#: ../src/roster_window.py:1574 ../src/roster_window.py:1580
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -1405,7 +1399,7 @@ msgstr ""
 msgid "as "
 msgstr "как "
 
-#: ../src/systray.py:238
+#: ../src/systray.py:246
 msgid "All contacts in this group are offline or have errors"
 msgstr "Все контакты в это группе отключены или имеют ошибки"
 
@@ -1420,41 +1414,43 @@ 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:274 ../src/tabbed_chat_window.py:342
+#: ../src/tabbed_chat_window.py:275 ../src/tabbed_chat_window.py:343
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Вы получили новое сообщение от \"%s\""
 
-#: ../src/tabbed_chat_window.py:275
+#: ../src/tabbed_chat_window.py:276
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
-msgstr "Если вы закроете эту вкладку и у вас отключена функция ведения истории сообщений, то это сообщение будет потеряно."
+msgstr ""
+"Если вы закроете эту вкладку и у вас отключена функция ведения истории "
+"сообщений, то это сообщение будет потеряно."
 
 #. we are not connected
-#: ../src/tabbed_chat_window.py:515
+#: ../src/tabbed_chat_window.py:516
 msgid "A connection is not available"
 msgstr "Подключение недоступно"
 
-#: ../src/tabbed_chat_window.py:516
+#: ../src/tabbed_chat_window.py:517
 msgid "Your message can not be sent until you are connected."
 msgstr "Ваше сообщение не может быть отправлено, пока вы не подключитесь."
 
-#: ../src/tabbed_chat_window.py:604
+#: ../src/tabbed_chat_window.py:605
 msgid "Sending private message failed"
 msgstr "Не удалось отправить личное сообщение"
 
 #. in second %s code replaces with nickname
-#: ../src/tabbed_chat_window.py:606
+#: ../src/tabbed_chat_window.py:607
 #, python-format
 msgid "You are no longer in room \"%s\" or \"%s\" has left."
 msgstr "Вы больше не находитесь в комнате \"%s\" или \"%s\" вышел."
 
-#: ../src/tabbed_chat_window.py:709
+#: ../src/tabbed_chat_window.py:710
 msgid "Encryption enabled"
 msgstr "Шифрование включено"
 
-#: ../src/tabbed_chat_window.py:714
+#: ../src/tabbed_chat_window.py:715
 msgid "Encryption disabled"
 msgstr "Шифрование отключено"
 
@@ -1481,17 +1477,18 @@ msgstr "Неизвестен"
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:273 ../src/vcard.py:291
+#: ../src/vcard.py:273 ../src/vcard.py:292
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: ../src/vcard.py:376
+#: ../src/vcard.py:377
 msgid "Without a connection you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации"
 
-#: ../src/vcard.py:404
+#: ../src/vcard.py:405
 msgid "Without a connection, you can not get your contact information."
-msgstr "Необходимо присоединиться к серверу для получения информации о контакте"
+msgstr ""
+"Необходимо присоединиться к серверу для получения информации о контакте"
 
 #: ../src/gtkgui.glade.h:1
 msgid "0"
@@ -1744,7 +1741,9 @@ msgstr "Отменяет выбранную передачу"
 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 "Останавливает выбранную передачу. Если есть незавершенный файл, то он будет удален. Операцию нельзя отменить."
+msgstr ""
+"Останавливает выбранную передачу. Если есть незавершенный файл, то он будет "
+"удален. Операцию нельзя отменить."
 
 #: ../src/gtkgui.glade.h:66
 msgid "Chan_ge"
@@ -1822,7 +1821,9 @@ msgstr "Щелкните здесь для получения расширенн
 
 #: ../src/gtkgui.glade.h:82
 msgid "Click to see features (like MSN, ICQ transports) of jabber servers"
-msgstr "Щелкните чтобы просмотреть сервисы предоставляемые jabber сервером (например MSN, ICQ транспорты)"
+msgstr ""
+"Щелкните чтобы просмотреть сервисы предоставляемые jabber сервером (например "
+"MSN, ICQ транспорты)"
 
 #: ../src/gtkgui.glade.h:83
 msgid "Click to see past conversation in this room"
@@ -1974,7 +1975,7 @@ msgstr "Формат: YYYY-MM-DD"
 msgid "From:"
 msgstr "От:"
 
-#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:217
+#: ../src/gtkgui.glade.h:122 ../src/tooltips.py:216
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -2015,8 +2016,10 @@ msgstr ""
 "правом нижнем углу экрана"
 
 #: ../src/gtkgui.glade.h:128
-msgid "Gajim will only change the icon of the contact that sent the new message"
-msgstr "Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
+msgid ""
+"Gajim will only change the icon of the contact that sent the new message"
+msgstr ""
+"Gajim будет лишь менять иконку у контакта, от которого пришло сообщение"
 
 #: ../src/gtkgui.glade.h:129
 msgid "Gajim: First Time Wizard"
@@ -2483,7 +2486,8 @@ msgstr "Отправить сообщение и закрыть окно"
 
 #: ../src/gtkgui.glade.h:242
 msgid "Sends a message to currently connected users to this server"
-msgstr "Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
+msgstr ""
+"Отправляет сообщение пользователям подсоединенным к серверу в данный момент"
 
 #: ../src/gtkgui.glade.h:243
 msgid "Server:"
@@ -3054,7 +3058,7 @@ msgstr "список передач"
 msgid "minutes"
 msgstr "минут"
 
-#: ../src/tooltips.py:213
+#: ../src/tooltips.py:212
 #, python-format
 msgid "Gajim - one unread message"
 msgid_plural "Gajim - %d unread messages"
@@ -3062,92 +3066,92 @@ msgstr[0] ""
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../src/tooltips.py:240 ../src/tooltips.py:242
+#: ../src/tooltips.py:239 ../src/tooltips.py:241
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
 
-#: ../src/tooltips.py:264
+#: ../src/tooltips.py:263
 msgid "Role: "
 msgstr "Должность: "
 
-#: ../src/tooltips.py:267
+#: ../src/tooltips.py:266
 msgid "Affiliation: "
 msgstr "Ранг: "
 
-#: ../src/tooltips.py:270 ../src/tooltips.py:351 ../src/tooltips.py:364
-#: ../src/tooltips.py:427
+#: ../src/tooltips.py:269 ../src/tooltips.py:353 ../src/tooltips.py:366
+#: ../src/tooltips.py:429
 msgid "Status: "
 msgstr "Статус: "
 
-#: ../src/tooltips.py:328 ../src/tooltips.py:391
+#: ../src/tooltips.py:330 ../src/tooltips.py:393
 #: ../src/filetransfers_window.py:429
 msgid "Name: "
 msgstr "Имя:  "
 
-#: ../src/tooltips.py:330
+#: ../src/tooltips.py:332
 msgid "Subscription: "
 msgstr "Подписка: "
 
-#: ../src/tooltips.py:340
+#: ../src/tooltips.py:342
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:360
+#: ../src/tooltips.py:362
 msgid "Resource: "
 msgstr "Ресурс: "
 
-#: ../src/tooltips.py:398
+#: ../src/tooltips.py:400
 msgid "Type: "
 msgstr "Тип: "
 
-#: ../src/tooltips.py:400
+#: ../src/tooltips.py:402
 msgid "Download"
 msgstr "Загрузить"
 
-#: ../src/tooltips.py:402
+#: ../src/tooltips.py:404
 msgid "Upload"
 msgstr "Upload"
 
-#: ../src/tooltips.py:404 ../src/filetransfers_window.py:431
+#: ../src/tooltips.py:406 ../src/filetransfers_window.py:431
 msgid "Sender: "
 msgstr "Отправитель:"
 
-#: ../src/tooltips.py:409 ../src/filetransfers_window.py:156
+#: ../src/tooltips.py:411 ../src/filetransfers_window.py:156
 #: ../src/filetransfers_window.py:433
 msgid "Recipient: "
 msgstr "Получатель:"
 
-#: ../src/tooltips.py:420
+#: ../src/tooltips.py:422
 msgid "Size: "
 msgstr "Размер: "
 
-#: ../src/tooltips.py:422
+#: ../src/tooltips.py:424
 msgid "Transferred: "
 msgstr "Передано: "
 
-#: ../src/tooltips.py:430 ../src/tooltips.py:451
+#: ../src/tooltips.py:432 ../src/tooltips.py:453
 msgid "Not started"
 msgstr "Не начато"
 
-#: ../src/tooltips.py:434
+#: ../src/tooltips.py:436
 msgid "Stopped"
 msgstr "Остановлено"
 
-#: ../src/tooltips.py:436 ../src/tooltips.py:439
+#: ../src/tooltips.py:438 ../src/tooltips.py:441
 msgid "Completed"
 msgstr "Завершено"
 
-#: ../src/tooltips.py:443
+#: ../src/tooltips.py:445
 msgid "Paused"
 msgstr "Приостановлено"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:447
+#: ../src/tooltips.py:449
 msgid "Stalled"
 msgstr "Ожидание"
 
-#: ../src/tooltips.py:449
+#: ../src/tooltips.py:451
 msgid "Transferring"
 msgstr "Передается"
 
@@ -3300,7 +3304,8 @@ msgstr "статус"
 
 #: ../scripts/gajim-remote.py:101
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
-msgstr "один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
+msgstr ""
+"один из: отключен, в сети, чат, отошел, недоступен, не беспокоить, невидимка"
 
 #: ../scripts/gajim-remote.py:103 ../scripts/gajim-remote.py:127
 msgid "message"
@@ -3355,11 +3360,13 @@ msgstr "PGP ключ"
 
 #: ../scripts/gajim-remote.py:128
 msgid "if specified, the message will be encrypted using this public key"
-msgstr "если указано, сообщение будет зашифровано с использование открытого ключа"
+msgstr ""
+"если указано, сообщение будет зашифровано с использование открытого ключа"
 
 #: ../scripts/gajim-remote.py:130
 msgid "if specified, the message will be sent using this account"
-msgstr "если указано, сообщение будет отправлено с использованием этого аккаунта"
+msgstr ""
+"если указано, сообщение будет отправлено с использованием этого аккаунта"
 
 #: ../scripts/gajim-remote.py:135
 msgid "Get detailed info on a contact"
@@ -3389,7 +3396,7 @@ msgstr "если указано, файл будет отправлен с ис
 msgid "Missing argument \"contact_jid\""
 msgstr "Пропущен аргумент \"JID контакта\""
 
-#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:486
+#: ../scripts/gajim-remote.py:172 ../scripts/gajim-remote.py:484
 msgid "Service not available"
 msgstr "Сервис недоступен"
 
@@ -3442,12 +3449,12 @@ msgstr ""
 "Использование: %s команда [аргумента]\n"
 "Команда одна из:\n"
 
-#: ../scripts/gajim-remote.py:317
+#: ../scripts/gajim-remote.py:315
 #, python-format
 msgid "Unknown type %s "
 msgstr "Неизвестный тип %s "
 
-#: ../scripts/gajim-remote.py:459
+#: ../scripts/gajim-remote.py:457
 #, python-format
 msgid ""
 "Argument \"%s\" is not specified. \n"
@@ -3456,3 +3463,14 @@ msgstr ""
 "Аргумент \"%s\" не задан. \n"
 "На берите \"%s\" help \"%s\" для справки"
 
+#~ msgid "Gajim disconnected you from %s"
+#~ msgstr "Gajim отсоединился от %s"
+
+#~ msgid ""
+#~ "%s seconds have passed and server did not reply to our keep-alive. If you "
+#~ "believe such disconnection should not have happened, you can disable "
+#~ "sending keep-alive packets by modifying this account."
+#~ msgstr ""
+#~ "Прошло %s секунд(а) и сервер не ответил на пинг. Если вы считаете,что "
+#~ "сервер работает нормально и этого не должно было случиться, то вы можете "
+#~ "отключить функцию отсылки пингов в настройках этого аккаунта."