updated po files with correct line numbers

19 files changed, 1614 insertions, 1609 deletions

diff --git a/po/bg/LC_MESSAGES/gajim.po b/po/bg/LC_MESSAGES/gajim.po
index 777b1a957..7004403e2 100644
--- a/po/bg/LC_MESSAGES/gajim.po
+++ b/po/bg/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-13 17:26+0200\n"
 "Last-Translator: Yavor Doganov <yavor@doganov.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -110,10 +110,10 @@ msgstr "Криптирането е изключено"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "не е в списъка"
@@ -272,7 +272,7 @@ msgstr ""
 "Трябва първо да създадете акаунт и след това да редактирате личните данни."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Не сте свързани към сървъра."
 
@@ -426,16 +426,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Премахване на акаунт %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Необходима е парола"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Въведете парола за акаунт „%s“"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Запазване на паролата"
 
@@ -646,7 +646,7 @@ msgstr "Попълнете данните за контакта, който ис
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Транспорти"
@@ -869,32 +869,32 @@ msgstr "%(contact_jid)s е поканен в %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Коментар: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Избор на звук"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Всички файлове"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Формат WAV"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Избор на изображение"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Изображения"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -958,11 +958,11 @@ msgstr "Тази услуга не съдържа обекти за показв
 msgid "Re_gister"
 msgstr "_Регистриране"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Влизане"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Редактиране"
 
@@ -1596,11 +1596,11 @@ msgstr "Публикуването на визитката е успешно"
 msgid "Your personal information has been published successfully."
 msgstr "Личната информация беше публикувана успешно."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Неуспех при публикуването на визитката"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1609,19 +1609,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Неуспех при запазването на настройките"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Липсва поддръжка за управление на сесиите (модул gnome.ui)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Мигриране на записите на разговорите..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Изчакайте, докато записите на разговорите се мигрират..."
 
@@ -3336,70 +3336,70 @@ msgstr "_Отказване"
 msgid "_Discover Services"
 msgstr "_Откриване на услуги"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Откриване на услуги..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_ЧЗВ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Файлов мениджър:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Филтър:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Приключване"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Стая"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Помощ"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Осветяване на неправилно изписаните думи"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Хост:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Прене_брегване на събития от контакти, които не са в списъка"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Входящо съобщение:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Влизане в нова стая..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Изритване"
@@ -3802,7 +3802,7 @@ msgstr "Сървър"
 msgid "You are already in room %s"
 msgstr "Вече сте в стая „%s“"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Не може да влезете в стая, докато сте невидими."
 
@@ -3896,39 +3896,39 @@ msgstr "Изкл_ючване"
 msgid "_Change Status Message"
 msgstr "Пром_яна на съобщението за състояние"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Упълномощаването беше изпратено"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "„%s“ вече ще знае състоянието ви."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Искането за записване беше изпратено"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ако „%s“ приеме това запитване, ще знаете за състоянието му."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Упълномощаването беше прекратено"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "„%s“ винаги ще ви вижда като изключен."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контактът „%s“ ще бъде премахнат от списъка ви"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3937,7 +3937,7 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3945,37 +3945,37 @@ msgstr ""
 "Премахвайки този контакт, прекратявате и упълномощаването. Контактът винаги "
 "ще ви вижда изключен."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Искам този контакт да вижда състоянието ми след премахването"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Необходима е парола"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Въведете парола за GPG ключ за акаунт „%s“"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Запазване на паролата"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Парола"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Участвате в една или повече стаи"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3983,20 +3983,20 @@ msgstr ""
 "Промяната на състоянието до „Невидим“ ще ви изключи от тези стаи. Сигурни ли "
 "сте, че искате да станете „Невидим“?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Няма наличен акаунт"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "За да разговаряте с други контакти, първо трябва да създадете Jabber акаунт."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Имате непрочетени съобщения"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4004,17 +4004,17 @@ msgstr ""
 "Може да преглеждате съобщенията по-късно само ако е активирана опцията за "
 "историята."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "От %s в стая %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Изпращане на файл до контакт"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Промяна на съобщението за състояние..."
 
@@ -4144,25 +4144,25 @@ msgstr ""
 "Тази услуга не можа да отговори с подробна информация.\n"
 "Най-вероятно е остаряла или повредена"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Търсене на %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4170,7 +4170,7 @@ msgstr ""
 "Този контакт се интересува от информацията за вашето състояние, но вие не се "
 "интересувате от неговото"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4178,13 +4178,13 @@ msgstr ""
 "Вие с интересувате от информацията за състоянието на този контакт, но той не "
 "се интересува от вашето"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Вие и контакта се интересувате взаимно от информацията за състоянията си"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4192,23 +4192,23 @@ msgstr ""
 "Вие не се интересувате от информацията за състоянието на контакта, както и "
 "той от вашата"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Чакате отговора на контакта относно запитването ви за записване"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " ресурс с приоритет "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Трябва да сте свързани, за да публикувате визитката."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Трябва да сте свързани, за да изтеглите визитката"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Лични данни"
@@ -4881,6 +4881,9 @@ msgstr ""
 msgid "cyan"
 msgstr "синьозелена"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Влизане в нова стая..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Употреба: /%s, настройва прозореца на стаята на компактен изглед."
 
@@ -4911,9 +4914,6 @@ msgstr "синьозелена"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Актуализиране на съобщението за деня"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Откриване на услуги..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML конзола..."
 
diff --git a/po/cs/LC_MESSAGES/gajim.po b/po/cs/LC_MESSAGES/gajim.po
index 9c3a80156..eb26ec246 100644
--- a/po/cs/LC_MESSAGES/gajim.po
+++ b/po/cs/LC_MESSAGES/gajim.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2006-04-12 10:59+0200\n"
 "Last-Translator: Pihhan <pihhan@seznam.cz>\n"
 "Language-Team:  <cs@li.org>\n"
@@ -123,10 +123,10 @@ msgstr "Šifrování vypnuto"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "není v seznamu"
@@ -277,7 +277,7 @@ 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:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Nejste připojen(a) k serveru"
 
@@ -428,16 +428,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Odstraňuju účet %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Vyžadováno heslo"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Zadejte heslo pro účet %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Uložit heslo"
 
@@ -645,7 +645,7 @@ msgstr "Prosím vyplňte údaje o kontaktu, který chcete přidat"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
@@ -859,32 +859,32 @@ msgstr "%(contact_jid)s Vás pozval(a) do místnosti %(room_jid)s"
 msgid "Comment: %s"
 msgstr "Komentář: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Vyberte zvuk"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Všechny soubory"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Waw soubory"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Vyberte obrázek"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr "Kdy %s může být:"
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Přidávám zvláštní notifikaci pro %s"
@@ -948,11 +948,11 @@ msgstr "Tato služba neobsahuje žádné položky, které je možno prohlížet.
 msgid "Re_gister"
 msgstr "Re_gistrace"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Vstoupit"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Úpravy"
 
@@ -1579,11 +1579,11 @@ msgstr "publikování vizitky bylo úspěšné"
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobní údaje byly úspěšně publikovány."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "publikování vizitky se nezdařilo"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1593,19 +1593,19 @@ msgstr ""
 # FIXME: jaky je rozdil mezi settings a preferences?
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Nelze uložit Vaše nastavení"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správce sezení není dostupná (schází gnome.ui modul)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Převádím historii..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Prosím vyčkejte až bude historie převedena..."
 
@@ -3289,67 +3289,69 @@ msgstr "O_dmítnout"
 msgid "_Discover Services"
 msgstr "_Prohlížet služby"
 
-#: ../src/gtkgui.glade.h:334
+# FIXME: chtelo by to cesky vyraz pro service discovery
+#: ../src/gtkgui.glade.h:333
+#, fuzzy
+msgid "_Discover Services..."
+msgstr "_Prohlížet služby"
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_File manager:"
 msgstr "_Správce souborů:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Dokončit"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Font:"
 msgstr "_Písmo:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Diskuze"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Nápověda"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "Zvýrazňovat _slova s překlepy"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Počítač:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovat události od kontaktů mimo můj Seznam"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Incoming message:"
 msgstr "_Příchozí zpráva:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Vstoupit do nové místnosti..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "Vy_kopnout"
@@ -3750,7 +3752,7 @@ msgstr "Přihlížející"
 msgid "You are already in room %s"
 msgstr "Už jsi v místnosti %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemůžete vstoupit do diskuze, pokud jste neviditelný(á)"
 
@@ -3841,40 +3843,40 @@ msgstr "_Odhlásit"
 msgid "_Change Status Message"
 msgstr "Z_měnit popis stavu"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autorizace byla odeslána"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nyní bude \"%s\" znát váš status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Žádost o autorizaci byla odeslána"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Pokud \"%s\" povolí Vaši žádost o autorizaci, budete vidět jeho status."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autorizace byla zrušena"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nyní Vás \"%s\" uvidí vždy jako odpojeného."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, 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:1800
+#: ../src/roster_window.py:1802
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -3882,7 +3884,7 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3890,36 +3892,36 @@ msgstr ""
 "Smazáním kontaktu také zrušíte autorizaci. Kontakt Vás tak vždy uvidí jako "
 "odpojeného."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Chci aby tento kontakt věděl o mém stavu i po odstranění"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Heslo Vyžadováno"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Zadej heslo GPG klíče pro účet %s."
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Uložit heslo"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 msgid "Wrong Passphrase"
 msgstr "Nesprávné heslo"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Prosím zopakujte Vaše heslo pro GPG klíč, nebo stiskněte Zrušit."
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Účinkujete v jedné nebo více diskuzích"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3927,20 +3929,20 @@ msgstr ""
 "Změna vašeho stavu na neviditelný způsobí odpojení od těchto diskuzí. Jste "
 "si jistý(á), že se chcete stát neviditelným(ou)?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Žádný účet není dostupný"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Máte nepřečtené zprávy"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3948,18 +3950,18 @@ msgstr ""
 "Zprávy bude možné číst později pouze v případě, budete-li mít povolenou "
 "historii."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Smazat %s ve skupině %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Učiň %s a %s metakontakty"
 
 # FIXME: nejak divne, asi spatne prelozene
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Změnit popis stavu..."
 
@@ -4093,64 +4095,64 @@ msgstr ""
 "Tato služba nemůže odpovědět s více podrobnostmi.\n"
 "Pravděpodobně je stará nebo rozbitá"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr "Nezdařilo se načtení obrázku"
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Client:Neznámý"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámý"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, python-format
 msgid "since %s"
 msgstr "od %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "Tento kontakt zajímá Váš stav, ale Vy se nezajímate o jeho stav"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "Vy se zajímáte o stav kontaktu, ale on se nezajímá o Váš stav"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vy i kontakt se zajímáte o stav toho druhého"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Vy ani kontakt se nezajímáte o stav toho druhého"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čekáte na odpověď kontaktu na vaši žádost o autorizaci"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr "zdroj s prioritou "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez opětovného připojení nemůžete zveřejnit Vaše osobní údaje."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Bez opětovného připojení nemůžete získat Vaše osobní údaje."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr "Osobní údaje"
 
@@ -4829,3 +4831,6 @@ msgstr "gtk+"
 #: ../src/common/optparser.py:176 ../src/common/optparser.py:177
 msgid "cyan"
 msgstr "azurová"
+
+#~ msgid "_Join New Room..."
+#~ msgstr "_Vstoupit do nové místnosti..."
diff --git a/po/de/LC_MESSAGES/gajim.po b/po/de/LC_MESSAGES/gajim.po
index cbbce752f..ff4ec80ff 100644
--- a/po/de/LC_MESSAGES/gajim.po
+++ b/po/de/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2006-04-12 08:34+0200\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <translators@gajim.org>\n"
@@ -108,10 +108,10 @@ msgstr "Verschlüsselung deaktiviert"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Nicht in der Liste"
@@ -269,7 +269,7 @@ msgstr ""
 "ändern können"
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Sie sind nicht mit dem Server verbunden"
 
@@ -425,16 +425,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Entferne Konto %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Passwort benötigt"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geben Sie ihr Passwort für %s ein"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Passwort speichern"
 
@@ -644,7 +644,7 @@ msgstr "Bitte geben sie die Daten des neuen Kontakts ein"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transports"
@@ -858,32 +858,32 @@ msgstr "%(contact_jid)s hat Sie in %(room_jid)s eingeladen"
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Sound wählen"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Alle Dateien"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav Dateien"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Bild auswählen"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr "Wenn %s wird:"
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Füge speziellen Hinweis für %s hinzu"
@@ -947,11 +947,11 @@ msgstr "Dieser Dienst enthält keine keine durchsuchbaren Objekte."
 msgid "Re_gister"
 msgstr "Re_gistrieren"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Ändern"
 
@@ -1579,11 +1579,11 @@ msgstr "vCard erfolgreich veröffentlicht"
 msgid "Your personal information has been published successfully."
 msgstr "Ihre persönlichen Informationen wurden erfolgreich veröffentlicht."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "vCard Veröffentlichung fehlgeschlagen"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1593,20 +1593,20 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Konnte Einstellungen nicht speichern"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sitzungsmanagment-Unterstützung nicht verfügbar (fehlendes gnome.ui Modul)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migriere Logs..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Bitte warten Sie, während die Logs migriert werden..."
 
@@ -3316,67 +3316,67 @@ msgstr "_Ablehnen"
 msgid "_Discover Services"
 msgstr "_Dienste durchsuchen"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Durchsuche Dienste..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_File manager:"
 msgstr "_Dateimanager:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Beenden"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Font:"
 msgstr "_Schriftart:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Gruppenchat"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Hilfe"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "Falsch geschriebene Wörter _hervorheben"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Verlauf"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Server:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_Info/Query"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "Ereignisse von Kontakten, die nicht in der Liste sind, _ignorieren"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Incoming message:"
 msgstr "_Eingehende Nachricht:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Neuen Raum betreten"
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Rausschmeißen"
@@ -3779,7 +3779,7 @@ msgstr "Beobachter"
 msgid "You are already in room %s"
 msgstr "Sie sind bereits im Raum %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Sie können einem Chatraum nicht beitreten, wenn Sie unsichtbar sind."
 
@@ -3870,39 +3870,39 @@ msgstr "_Abmelden"
 msgid "_Change Status Message"
 msgstr "Ändere _Statusnachricht"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autorisierung wurde erneut gesendet"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" kennt jetzt ihren Status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Abonnement-Anforderung wurde gesendet"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Wenn d\"%s\" diese Anfrage akzeptiert, erfahren Sie dessen Status."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autorisierung wurde entfernt"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" wird Sie nun immer als offline sehen."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" wird von ihrer Kontaktliste entfernt"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -3910,7 +3910,7 @@ msgstr ""
 "Durch die Entfernung dieses Kontaktes entziehen Sie ihm auch die "
 "Authorisation, wodurch der Kontakt sie nur noch als offline sehen wird."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3918,39 +3918,39 @@ msgstr ""
 "Durch die Entfernung dieses Kontaktes entziehen Sie ihm auch die "
 "Authorisation, wodurch der Kontakt sie nur noch als offline sehen wird."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "I möchte, dass dieser Kontakt meinen Status auch nach der Entfernung sieht"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Passphrase benötigt"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, 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:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Passphrase speichern"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 msgid "Wrong Passphrase"
 msgstr "Falsche Passphrase"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 "Bitte geben Sie Ihre GPG-Passphrase erneut ein oder klicken Sie auf "
 "Abbrechen."
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Sie nehmen an einem oder mehreren Gruppenchats teil"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3958,37 +3958,37 @@ msgstr ""
 "Wenn Sie Ihren Status auf unsichtbar setzen, werden sie von diesen "
 "Gruppenchats getrennt. Sind Sie sicher, dass sie unsichtbar werden möchten?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Kein Konto vorhanden"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Sie haben ungelesene Nachrichten"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Um Nachrichten später lesen zu können, muss der Verlauf aktiv sein."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Setze %s in Gruppe %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Mache %s und %s Metakontakte"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Ändere Statusnachricht..."
 
@@ -4118,25 +4118,25 @@ msgstr ""
 "Dieser Dienst konnte nicht mit detaillierten Informationen antworten\n"
 "Er ist wahrscheinlich verwaltet oder defekt"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr "Konnte Bild nicht laden"
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Unbekannt"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, python-format
 msgid "since %s"
 msgstr "seit %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4144,7 +4144,7 @@ msgstr ""
 "Dieser Kontakt ist an Ihren Anwesenheitsinformationen interessiert, aber Sie "
 "sindnicht an seiner/ihrer Anwesenheit interessiert"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4152,14 +4152,14 @@ msgstr ""
 "Sie sind an den Anwesenheitsinformationen des Kontakts interessiert, aber er/"
 "sieist nicht an ihren interessiert"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Sie und der Kontakt sind an den Anwesenheitsinformationen des anderen "
 "interessiert"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4167,24 +4167,24 @@ msgstr ""
 "Sie sind nicht an der Anwesenheit des Kontakts interessiert, und er/sie "
 "istnicht interessiert an ihrer"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Sie warten auf die Antwort des Kontaktes auf ihre Abonnement-Anfrage"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " resource mit Priorität "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Sie müssen angemeldet sein, um Kontakt-Informationen zu veröffentlichen"
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sie müssen angemeldet sein, um Kontakt-Informationen abzurufen"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr "Persönliche Details"
 
@@ -4875,6 +4875,9 @@ msgstr "gtk+"
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Neuen Raum betreten"
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Bedienung: /%s, stellt das Gruppenchat-Fenster auf Kompaktmodus."
 
@@ -4902,9 +4905,6 @@ msgstr "cyan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Aktualisiere Nachricht des Tages (MOTD)"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Durchsuche Dienste..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsole..."
 
diff --git a/po/el/LC_MESSAGES/gajim.po b/po/el/LC_MESSAGES/gajim.po
index cfd5f8c32..f1bead334 100644
--- a/po/el/LC_MESSAGES/gajim.po
+++ b/po/el/LC_MESSAGES/gajim.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-17 23:13+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg2002@freemail.gr>\n"
 "Language-Team: Hellenic-Ελληνικά-Greek\n"
@@ -115,10 +115,10 @@ msgstr "Απενεργοποιήθηκε η κρυπτογράφηση"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "εκτός λίστας επαφών"
@@ -279,7 +279,7 @@ msgstr ""
 "τροποποιείτε τις προσωπικές σας πληροφορίες"
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Δεν είστε συνδεδεμένος στον διακομιστή"
 
@@ -435,16 +435,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Aφαιρώντας τον λογαριασμό %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Απαιτείται Κωδικός"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Πληκτρολογήστε τον κωδικό σας για το λογαριασμό %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Αποθήκευση κωδικού"
 
@@ -661,7 +661,7 @@ msgstr "Παρακαλώ συμπληρώστε τα στοιχεία της ε�
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Μεταφορές"
@@ -884,32 +884,32 @@ msgstr "Προσκαλέσατε τον/την %(contact_jid)s στο %(room_jid
 msgid "Comment: %s"
 msgstr "Σχόλιο: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Επιλογή Ήχου"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Όλα τα αρχεία"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Αρχεία Ήχου Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Επιλογή Εικόνας"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Εικόνες"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -973,11 +973,11 @@ msgstr "Αυτή η υπηρεσία δεν περιέχει άλλα αντικ
 msgid "Re_gister"
 msgstr "_Εγγραφή"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Συμμετοχή"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "Ε_πεξεργασία"
 
@@ -1622,11 +1622,11 @@ msgstr "Η δημοσιοποίηση της vCard έγινε επιτυχώς"
 msgid "Your personal information has been published successfully."
 msgstr "Οι προσωπικές σας πληροφορίες δημοσιοποιήθηκαν με επιτυχία."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Η δημοσιοποίηση της vCard απέτυχε"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1636,21 +1636,21 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Δεν ήταν δυνατή η αποθήκευση των προτιμήσεων σας"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Η υποστήριξη για Διαχείριση Συνόδων δεν είναι διαθέσιμη (δεν υπάρχει το "
 "άρθρωμα του gnome.ui)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Μεταφορά Ιστορικού..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Παρακαλώ περιμένετε όσο μεταφέρεται το ιστορικό..."
 
@@ -3378,70 +3378,70 @@ msgstr "_Άρνηση"
 msgid "_Discover Services"
 msgstr "Εύρεση _Υπηρεσιών"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "Εύρεση _Υπηρεσιών..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_Συχνές Ερωτήσεις"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Διαχειριστής αρχείων:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Φιλτράρισμα:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Τέλος"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Γραμματοσειρά:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Ομαδική Συζήτηση"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Βοήθεια"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Υπογράμμιση λέξεων με τυπογραφικά λάθη"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Ιστορικό"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Ξένιος υπολογιστής:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Αγνόησε γεγονότα από επαφές που δεν είναι στη λίστα επαφών"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Εισερχόμενο μήνυμα:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "Σύνδεση σε _Νέο Δωμάτιο..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Ξεφορτώσου τον"
@@ -3845,7 +3845,7 @@ msgstr "Διακομιστής"
 msgid "You are already in room %s"
 msgstr "Βρίσκεστε ήδη στο δωμάτιο %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Δεν μπορείτε να συμμετάσχετε σε μια ομαδική συζήτηση εάν είστε αόρατος"
 
@@ -3937,40 +3937,40 @@ msgstr "_Αποσύνδεση"
 msgid "_Change Status Message"
 msgstr "Α_λλαγή Μηνύματος Κατάστασης"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Η εξουσιοδότηση έχει σταλεί"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Τώρα ο/η \"%s\" θα γνωρίζει την κατάσταση σας."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Η αίτηση εγγραφής έχει σταλεί"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Εάν ο/η \"%s\" αποδεχθεί αυτή την αίτηση, θα γνωρίζετε την κατάσταση του/της."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Η εξουσιοδότηση έχει αφαιρεθεί"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Τώρα ο/η \"%s\" θα σας βλέπει πάντα ως αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Η επαφή \"%s\" θα αφαιρεθεί από την λίστα επαφών σας"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3979,7 +3979,7 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3987,37 +3987,37 @@ msgstr ""
 "Αφαιρώντας αυτή την επαφή αφαιρείται επίσης και την εξουσιοδότηση, με "
 "συνέπεια να σας βλέπει πάντα αποσυνδεδεμένο/η."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Επιθυμώ αυτή η επαφή να γνωρίζει την κατάστασή μου μετά την αφαίρεση"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Απαιτείται κωδικοφράση"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Πληκτρολογήστε την GPG κωδικοφράση για το λογαριασμό %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Αποθήκευση της Κωδικοφράσης"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Κωδικοφράση"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Συμμετέχετε σε μία ή περισσότερες ομαδικές κουβέντες"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4025,21 +4025,21 @@ msgstr ""
 "Εάν αλλάξετε την κατάστασή σας σε αόρατη, θα αποσυνδεθείτε από αυτές τις "
 "ομαδικές συζητήσεις. Είστε σίγουρος/η ότι θέλετε να γίνεται αόρατος/η;"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Κανένας λογαριασμός δεν είναι διαθέσιμος"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Πρέπει να δημιουργήσετε ένα λογαριασμό για να μπορέσετε να συνομιλείτε με "
 "άλλες επαφές."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Έχετε μη-αναγνωσμένα μηνύματα"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4047,17 +4047,17 @@ msgstr ""
 "Τα μηνύματα θα είναι διαθέσιμα για ανάγνωση αργότερα μόνο αν έχετε "
 "ενεργοποιημένο το ιστορικό."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Από %s στο δωμάτιο %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Αποστολή αρχείου σε μία επαφή"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Αλλαγή Μηνύματος Κατάστασης..."
 
@@ -4187,25 +4187,25 @@ msgstr ""
 "Αυτή η υπηρεσία δεν μπόρεσε να απαντήσει με λεπτομερείς πληροφορίες.\n"
 "Είναι είτε χαλασμένη είτε πεπαλαιωμένη."
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Άγνωστος"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Άγνωστο"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Περιήγηση στο %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4213,7 +4213,7 @@ msgstr ""
 "Αυτή η επαφή ενδιαφέρεται για την παρουσία σας ή μη, αλλά εσείς δεν "
 "ενδιαφέρεστε για την παρουσία του/της"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4221,12 +4221,12 @@ msgstr ""
 "Εσείς ενδιαφέρεστε για την παρουσία αυτής της επαφής, αλλά αυτός/η δεν "
 "ενδιαφέρεται για τη δική σας"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Εσείς και η επαφή ενδιαφέρεστε για την παρουσία ή μη του άλλου"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4234,26 +4234,26 @@ msgstr ""
 "Δεν ενδιαφέρεστε για την παρουσία ή μη της επαφής, και ούτε αυτός/η "
 "ενδιαφέρεται για εσάς"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Περιμένετε την απάντηση της επαφής για την αίτηση συνδρομής σας"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " πόρος με προτεραιότητα"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να δημοσιεύσετε τις πληροφορίες της επαφής "
 "σας"
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Πρέπει να είστε συνδεδεμένος για να λάβετε τις πληροφορίες της επαφής σας"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Προσωπικές Πληροφορίες"
@@ -4932,6 +4932,9 @@ msgstr ""
 msgid "cyan"
 msgstr "κυανό"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "Σύνδεση σε _Νέο Δωμάτιο..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Χρήση: /%s, θέτει το παράθυρο της ομαδικής κουβέντας σε συμπαγή κατάσταση."
@@ -4963,9 +4966,6 @@ msgstr "κυανό"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Ενημέρωση Μηνύματος της Ημέρας"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "Εύρεση _Υπηρεσιών..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Κονσόλα _XML..."
 
diff --git a/po/es/LC_MESSAGES/gajim.po b/po/es/LC_MESSAGES/gajim.po
index 302a001ab..f48d3f085 100644
--- a/po/es/LC_MESSAGES/gajim.po
+++ b/po/es/LC_MESSAGES/gajim.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-05-21 20:03+0100\n"
 "Last-Translator: Membris Khan <membriskhan@gmail.com>\n"
 "Language-Team: none\n"
@@ -109,10 +109,10 @@ msgstr "Encriptación desactivada"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "no está en el roster"
@@ -270,7 +270,7 @@ 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:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "No estás conectado al servidor"
 
@@ -424,16 +424,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Eliminando la cuenta %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Contraseña requerida"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduce contraseña para la cuenta %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Guardar contraseña"
 
@@ -648,7 +648,7 @@ msgstr "Por favor, rellena la información del contacto que quieres añadir"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
@@ -866,32 +866,32 @@ msgstr "%(contact_jid)s invitado a %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Comentario: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Elegir sonido"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Todos los archivos"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Sonidos Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Elegir Imagen"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Imágenes"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -955,11 +955,11 @@ msgstr "Este servicio no contiene elementos para navegar."
 msgid "Re_gister"
 msgstr "_Suscribir"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1591,11 +1591,11 @@ msgstr "vCard publicada con éxito"
 msgid "Your personal information has been published successfully."
 msgstr "Tu información personal ha sido publicada con éxito"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "falló la publicación de la vCard"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1605,19 +1605,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "No se pueden guardar las preferencias"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Soporte de manejo de sesión no disponible (falta el módulo gnome.ui)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migrando el registro..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Por favor, espera mientras el registro está siendo migrado..."
 
@@ -3334,70 +3334,70 @@ msgstr "_Denegar"
 msgid "_Discover Services"
 msgstr "_Descubrir servicios"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Descubrir servicios..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Administrador de archivos:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Finalizar"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Fuente:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Grupos de charla"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Ayuda"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Resaltar errores ortográficos"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr ""
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar mensajes de contactos que no están en la lista de contactos"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensaje entrante:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "ID de _Jabber: "
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "E_ntrar a un nuevo salón..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Expulsar"
@@ -3800,7 +3800,7 @@ msgstr "Servidor"
 msgid "You are already in room %s"
 msgstr "Ya estás en el salón %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "No puedes entrar a un salón de chat estando invisible"
 
@@ -3891,39 +3891,39 @@ msgstr "_Desconectar"
 msgid "_Change Status Message"
 msgstr "_Cambiar mensaje de estado"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "La autorización ha sido enviada"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ahora \"%s\" podrá saber tu estado."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "La petición de subscripción ha sido enviada"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" acepta esta petición podrás saber su estado."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "La autorización ha sido eliminada"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ahora \"%s\" siempre te verá desconectado."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "El contacto \"%s\" será eliminado de tu roster"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3932,7 +3932,7 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3940,37 +3940,37 @@ msgstr ""
 "Eliminando este contacto también se está eliminando la autorización. Este "
 "contacto siempre te verá desconectado."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Quiero que este contacto conozca mi estado después de la eliminación"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Contraseña requerida"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduce contraseña GPG para la cuenta %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Guardar contraseña"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Contraseña"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Estás participando en uno o más grupos de charla"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3978,19 +3978,19 @@ msgstr ""
 "Cambiando tu estado a invisible provocará tu desconexión de los grupos de "
 "charla. ¿Estás seguro de querer ser invisible?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Cuenta no disponible"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Tienes mensajes sin leer"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3998,17 +3998,17 @@ msgstr ""
 "Los mensajes sólo estarán disponibles para lectura posterior si tienes el "
 "histórico activado"
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s en el salón %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Enviar archivo a un contacto"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Cambiar mensaje de estado..."
 
@@ -4138,25 +4138,25 @@ msgstr ""
 "Este servicio podría no responder con información detallada.\n"
 "Posiblemente es antiguo o está roto"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Desconocido"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4164,7 +4164,7 @@ msgstr ""
 "Este contacto está interesado en la información de tu presencia, pero tú no "
 "lo estás en la suya"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4172,14 +4172,14 @@ msgstr ""
 "Estás interesado en la información de la presencia del contacto, pero él/"
 "ella no lo está en la tuya"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tanto tú como el contacto estáis interesados en la información de la "
 "presencia del otro"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4187,24 +4187,24 @@ msgstr ""
 "No estás interesado en la presencia del contacto y el/ella tampoco lo está "
 "en el tuyuo"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Estás esperando la respuesta del contacto acerca de tu petición de adición"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " recurso con prioridad "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Sin una conexión no puedes publicar tu información de contacto."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Sin una conexión, no puedes obtener tu información de contacto."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Información personal"
@@ -4875,6 +4875,9 @@ msgstr ""
 msgid "cyan"
 msgstr ""
 
+#~ msgid "_Join New Room..."
+#~ msgstr "E_ntrar a un nuevo salón..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Uso: /%s, cambia la ventana de salón a modo compacto."
 
@@ -4905,9 +4908,6 @@ msgstr ""
 #~ msgid "Update Message of the Day"
 #~ msgstr "Actualizar mensaje del día"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Descubrir servicios..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Consola _XML..."
 
diff --git a/po/eu/LC_MESSAGES/gajim.po b/po/eu/LC_MESSAGES/gajim.po
index ab6293bd8..8365952ce 100644
--- a/po/eu/LC_MESSAGES/gajim.po
+++ b/po/eu/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2006-04-11 22:30+0100\n"
 "Last-Translator: Urtzi Alfaro <urtzi@altza.net>\n"
 "Language-Team: Basque <urtzi@altza.net>\n"
@@ -108,10 +108,10 @@ msgstr "Enkriptazioa desaktibatuta"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Ez dago zerrendan"
@@ -268,7 +268,7 @@ msgid "You must create your account before editing your personal information."
 msgstr "Kontu bat sortu behar duzu informazio petsonala editatu baino lehen."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Ez zaude zerbitzarira konektatuta"
 
@@ -425,16 +425,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "%s kontua ezabatzen"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Pasahitza behar da"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "%s kontuaren pasahitza sartu"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Gorde pasahitza"
 
@@ -639,7 +639,7 @@ msgstr "Mesedez bete sartu nahi duzun kontaktuaren informazioa"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportea"
@@ -855,32 +855,32 @@ msgstr "%(contact_jid)s -ek %(room_jid)s gelara gonbidatu zaitu"
 msgid "Comment: %s"
 msgstr "Azalpenak: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Aukeratu Soinua"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Fitxategi guztiak"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav Soinuak"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Aukeratu Irudia"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Irudiak"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr "%s bihurtzen denean:"
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Jakinarazketa Berezia Gehitzen %s-entzat"
@@ -944,11 +944,11 @@ msgstr "Zerbitzari honek ez du begiratzeko menurik."
 msgid "Re_gister"
 msgstr "Erre_gistratu"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Sartu"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Editatu"
 
@@ -1568,11 +1568,11 @@ msgstr "vCard argitarapena egina"
 msgid "Your personal information has been published successfully."
 msgstr "Zure informazio pertsonala egoki argitaratua izan da."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "vCard argitarapenak hust egin du"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1582,19 +1582,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Ezin izan dira zure aldaketak eta hobespenak gorde"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management support not available (missing gnome.ui module)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Log-ak Eraldatzen..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Mesedez itxoin log-a eraldatzen den bitartean...."
 
@@ -3282,67 +3282,67 @@ msgstr "_Ukatu"
 msgid "_Discover Services"
 msgstr "_Zerbitzuak Aurkitu"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Zerbitzuak Aurkitu..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 msgid "_File manager:"
 msgstr "_Fitxero administratzaile:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtroa:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Bukatu"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 msgid "_Font:"
 msgstr "_Mota:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "Txat _Taldea"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Laguntza"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Highlight misspelled words"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historiala"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Host-a"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IG"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Zerrendan ez dauden kontaktuen gertaerak baztertu"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Incoming message:"
 msgstr "_Sarrerako mezua:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "Gela Berrian _Sartu..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Bota"
@@ -3744,7 +3744,7 @@ msgstr "Begiratzaileak"
 msgid "You are already in room %s"
 msgstr "%s gelan zaude dagoeneko"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Ezin duzu txat talde batera sartu ikusezin zauden bitartean"
 
@@ -3835,39 +3835,39 @@ msgstr "Log _desaktibatua"
 msgid "_Change Status Message"
 msgstr "_Egoera Mezua aldatu"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autorizazioa bidalia izan da"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Orain \"%s\"-ak jakingo du zure egoera."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Harpidetza eskaria bidalia izan da"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "\"%s\" harpidetza onartzen baduzu bere egoera ikus ahal izango duzu."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autorizazioa ezabatua izan da."
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Orain \"%s\" deskonektatuta ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "\"%s\" kontaktua ezabatua izango da zure zerrendatik"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -3875,7 +3875,7 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere ezabatzen duzu. Beraz, kontaktuak "
 "deskonektatua ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3883,36 +3883,36 @@ msgstr ""
 "Kontaktua ezabatuz bere autorizazioa ere borratzen duzu. Beraz,  kontaktuak "
 "deskonektatua ikusiko zaitu beti."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Kontaktu hau ezabatu ondoren nire egoera jakitea nahi dut"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Pasa-esaldia Behar da"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Sartu GPG kodearen pasa-esaldia %s konturako."
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Gorde pasa-esaldia"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 msgid "Wrong Passphrase"
 msgstr "Pasa-esaldi okerra"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Mesedez berridatzi zure GPG pasa-esaldia edo kantzelatu."
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Txat talde bat baino gehiegotan parte hartzen ari zara."
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3920,36 +3920,36 @@ msgstr ""
 "Zure egoera ikusezinera pasatzen baduzu deskonektatu egingo zara txat talde "
 "honetatik. Ziur al zaude ikusezin jarri nahi duzula?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Ez dago konturik erabilgarri"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Kontu bat sortu behar duzu norbaitekin txateatzeko aukera izan baino lehen."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Irakurri gabeko mezu bat duzu"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Mezuak gero irakurri ahalko dira historiala aktibatua baduzu."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, python-format
 msgid "Drop %s in group %s"
 msgstr "Bidali %s taldea %s-era"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Egin %s eta %s metacontacts"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Egoera Mezua Aldatu..."
 
@@ -4079,25 +4079,25 @@ msgstr ""
 "Zerbitzu honek ezin izan du erantzun.\n"
 "Seguraski ez du erantzun espero bezala edo ez dabil."
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr "Ezin izan da irudia kargatu"
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Aurkitu gabea"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, python-format
 msgid "since %s"
 msgstr "noiztik %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4105,7 +4105,7 @@ msgstr ""
 "Kontu hau zure egoera informazioan interesatuta dago , baina zu ez zaude "
 "haren egoera informazioan interesatuta"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4113,36 +4113,36 @@ msgstr ""
 "Kontaktuaren egoera informazioan interesatuta zaude, baina berak ez du zugan "
 "interesik"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Zu eta kontaktua, bien egoera informazioetan interesatuta zaudete"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Zu ez zaude haren egoera informazioan interesatuta, bera zugan interesa du"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Zure harpidetza eskariaren erantzunaren zain zaude kontaktuaren aldetik"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr "baliabidea lehentasunarekin: "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktuaren informazioa ezarri."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Konexiorik gabe ezin duzu zure kontaktu informazioa lortu."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr "Informazio pertsonala"
 
@@ -4822,6 +4822,9 @@ msgstr "gtk+"
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "Gela Berrian _Sartu..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Erabilera: /%s, talde txat-eko leihoa compact moduan jarri."
 
@@ -4849,9 +4852,6 @@ msgstr "cyan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Eguneko Mezua Gaurkotu"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Zerbitzuak Aurkitu..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsola..."
 
diff --git a/po/fr/LC_MESSAGES/gajim.po b/po/fr/LC_MESSAGES/gajim.po
index 96e325d89..c2023a664 100644
--- a/po/fr/LC_MESSAGES/gajim.po
+++ b/po/fr/LC_MESSAGES/gajim.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-08 10:56+0100\n"
 "Last-Translator: Yann Le Boulanger <asterix@lagaule.org>\n"
 "Language-Team: none\n"
@@ -113,10 +113,10 @@ msgstr "Encryption désactivée"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Absent de la liste"
@@ -274,7 +274,7 @@ 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:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Vous n'êtes pas connecté au serveur"
 
@@ -429,16 +429,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Supprimer le compte %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Mot de passe requis"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entrez votre mot de passe pour le compte %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Enregistrer le mot de passe"
 
@@ -652,7 +652,7 @@ msgstr "Remplissez les informations sur le contact à ajouter"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Passerelles"
@@ -874,32 +874,32 @@ msgstr ""
 msgid "Comment: %s"
 msgstr "Commentaire : %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Choisissez un son"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Tous les fichiers"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Sons wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Choisissez une Image"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Images"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -963,11 +963,11 @@ msgstr "Ce service ne contient aucun élément à parcourir."
 msgid "Re_gister"
 msgstr "_Souscrire"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "Re_joindre"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Éditer"
 
@@ -1595,11 +1595,11 @@ msgstr "la vCard a été publiée avec succés"
 msgid "Your personal information has been published successfully."
 msgstr "Vos informations personnelles ont été publiées avec succès."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "échec lors de la publication de votre vCard"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1609,20 +1609,20 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Impossible de sauver vos informations de configuration"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Support du gestionnaire de sessions indisponible (module gnome.ui manquant)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migration de l'historique..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Merci de patienter pendant la migration de l'historique..."
 
@@ -3351,70 +3351,70 @@ msgstr "_Refuser"
 msgid "_Discover Services"
 msgstr "_Découvrir les services"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Découvrir les services..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestionnaire de fichiers :"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtre :"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Finir"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Police :"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Salons de discussion"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Aide"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Souligner les fautes d'orthographe"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historique"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Serveur :"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer les messages des contacts qui ne sont pas dans votre liste"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Message entrant :"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "Identifiant _Jabber : "
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "Re_joindre un nouveau salon..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Éjecter"
@@ -3816,7 +3816,7 @@ msgstr "Serveur"
 msgid "You are already in room %s"
 msgstr "Vous êtes déjà dans le salon %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 "Vous ne pouvez pas joindre un salon de discussion tant que vous êtes "
@@ -3910,39 +3910,39 @@ msgstr "_Déconnecter"
 msgid "_Change Status Message"
 msgstr "_Changer le message d'état"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "L'Autorisation a été envoyée"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Désormais \"%s\" connaîtra votre état."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "La requête d'inscription a été envoyée"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Si \"%s\" accepte cette requête, vous connaîtrez son état."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "L'Autorisation a été supprimée"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Dorénavant, \"%s\" vous verra toujours déconnecté."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, 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:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3951,7 +3951,7 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3959,37 +3959,37 @@ msgstr ""
 "En supprimant ce contact, vous supprimez également son autorisation. Il vous "
 "verra donc toujours déconnecté."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Autoriser ce contact à connaître mon état après la suppression"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Mot de Passe Requis"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Entrez votre mot de passe GPG pour le compte %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Enregistrer le mot de passe"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Mot de passe"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Vous participez à un ou plusieurs salons"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3997,20 +3997,20 @@ msgstr ""
 "Basculer en état invisible entraînera votre déconnexion ces salons. Êtes-"
 "vous sûr de vouloir être invisible ?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Aucun compte disponible"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Vous avez des messages non-lus"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4018,17 +4018,17 @@ msgstr ""
 "Les messages seront disponibles à une lecture ultérieure si l'archivage de "
 "l'historique est actif."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De la part de %s dans le salon %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envoyer un fichier à un contact"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Changer le message d'état..."
 
@@ -4158,32 +4158,32 @@ msgstr ""
 "Ce service n'a pas renvoyé d'informations détaillées.\n"
 "Il est probablement défectueux ou cassé"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Inconnu"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Parcourt %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 "Ce contact s'intéresse à votre état mais vous ne vous intéressez au sien"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4191,12 +4191,12 @@ msgstr ""
 "Vous vous intéressez à l'état de ce contact mais il ne s'intéresse pas au "
 "votre"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Vous et ce contact vous intéressez à vos états réciproques"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4204,24 +4204,24 @@ msgstr ""
 "Vous n'êtes pas intéressé par l'état de ce contact et il ne s'intéressepas "
 "au votre"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Vous attendez la réponse de ce contact pour votre demande de voir son état"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " ressource avec la priorité "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Vous devez être connecté pour publier vos informations."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Vous devez être connecté pour récupérer vos informations."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Informations personnelles"
@@ -4894,6 +4894,9 @@ msgstr ""
 msgid "cyan"
 msgstr "Cyan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "Re_joindre un nouveau salon..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Usage : /%s, passe la fenêtre de salon de discussion en vue compacte."
@@ -4925,9 +4928,6 @@ msgstr "Cyan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Mettre à jour le message du jour"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Découvrir les services..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Console _XML..."
 
diff --git a/po/gajim.pot b/po/gajim.pot
index 8cd921b1f..f69a779a2 100644
--- a/po/gajim.pot
+++ b/po/gajim.pot
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -102,10 +102,10 @@ msgstr ""
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr ""
@@ -255,7 +255,7 @@ msgid "You must create your account before editing your personal information."
 msgstr ""
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr ""
 
@@ -397,16 +397,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr ""
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr ""
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr ""
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr ""
 
@@ -608,7 +608,7 @@ msgstr ""
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr ""
@@ -820,32 +820,32 @@ msgstr ""
 msgid "Comment: %s"
 msgstr ""
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr ""
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr ""
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr ""
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr ""
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr ""
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -907,11 +907,11 @@ msgstr ""
 msgid "Re_gister"
 msgstr ""
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr ""
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr ""
 
@@ -1512,11 +1512,11 @@ msgstr ""
 msgid "Your personal information has been published successfully."
 msgstr ""
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr ""
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1524,19 +1524,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr ""
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr ""
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 
@@ -3118,67 +3118,67 @@ msgstr ""
 msgid "_Discover Services"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:334
-msgid "_FAQ"
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
 msgstr ""
 
 #: ../src/gtkgui.glade.h:335
-msgid "_File manager:"
+msgid "_FAQ"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:336
-msgid "_Filter:"
+msgid "_File manager:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:337
-msgid "_Finish"
+msgid "_Filter:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:338
-msgid "_Font:"
+msgid "_Finish"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:339
-msgid "_Group Chat"
+msgid "_Font:"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:340
-msgid "_Help"
+msgid "_Group Chat"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:341
-msgid "_Highlight misspelled words"
+msgid "_Help"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:342
-msgid "_History"
+msgid "_Highlight misspelled words"
 msgstr ""
 
 #: ../src/gtkgui.glade.h:343
+msgid "_History"
+msgstr ""
+
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr ""
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 msgid "_Incoming message:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr ""
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr ""
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr ""
@@ -3565,7 +3565,7 @@ msgstr ""
 msgid "You are already in room %s"
 msgstr ""
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr ""
 
@@ -3654,114 +3654,114 @@ msgstr ""
 msgid "_Change Status Message"
 msgstr ""
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr ""
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr ""
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr ""
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr ""
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr ""
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr ""
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr ""
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr ""
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 msgid "Wrong Passphrase"
 msgstr ""
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr ""
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr ""
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr ""
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr ""
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, python-format
 msgid "Drop %s in group %s"
 msgstr ""
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, python-format
 msgid "Make %s and %s metacontacts"
 msgstr ""
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr ""
 
@@ -3889,64 +3889,64 @@ msgid ""
 "It is most likely legacy or broken"
 msgstr ""
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr ""
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, python-format
 msgid "since %s"
 msgstr ""
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr ""
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr ""
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr ""
 
diff --git a/po/it/LC_MESSAGES/gajim.po b/po/it/LC_MESSAGES/gajim.po
index f947a3f3a..1a23fc5df 100644
--- a/po/it/LC_MESSAGES/gajim.po
+++ b/po/it/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2006-03-02 15:11+0100\n"
 "Last-Translator: Matteo Dell'Amico <della@linux.it>\n"
 "Language-Team: Italian\n"
@@ -111,10 +111,10 @@ msgstr "Cifratura disattivata"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Non nei contatti"
@@ -274,7 +274,7 @@ msgstr ""
 "informazioni personali."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Non si è connessi al server"
 
@@ -433,16 +433,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Eliminazione account %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Password richiesta"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Inserire la password per l'account %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Memorizza password"
 
@@ -655,7 +655,7 @@ msgstr "Inserire i dati del contatto che si vuole aggiungere"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Trasporti"
@@ -875,32 +875,32 @@ msgstr "Si è invitato %(contact_jid)s a %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Commento: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Scegliere il suono"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Tutti i file"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Suoni Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Scegli immagine"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Immagini"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -965,11 +965,11 @@ msgstr "Questo servizio non contiene oggetti da consultare."
 msgid "Re_gister"
 msgstr "_Registra"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Entra"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Modifica"
 
@@ -1598,11 +1598,11 @@ msgstr "La vCard è stata pubblicata correttamente"
 msgid "Your personal information has been published successfully."
 msgstr "Le informazioni personali sono state pubblicate con successo."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Pubblicazione della vCard fallita"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1612,19 +1612,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Impossibile salvare impostazioni e preferenze"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Supporto gestione sessioni non disponibile (modulo gnome.ui mancante)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migrazione log..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Attendere durante la migrazione dei log..."
 
@@ -3343,70 +3343,70 @@ msgstr "_Nega"
 msgid "_Discover Services"
 msgstr "_Ricerca servizi"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Ricerca servizi..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "File manager:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Fine"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Carattere:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "Chat di _gruppo"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "Evidenzia _parole scorrette"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Cronologia"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "I_Q"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignora gli eventi da contatti non appartenenti alla lista"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Messaggio in arrivo:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "ID _Jabber:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Entra in nuova stanza..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Caccia"
@@ -3810,7 +3810,7 @@ msgstr "Osservatori"
 msgid "You are already in room %s"
 msgstr "Sei già nella stanza %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Non è possibile unirsi ad una stanza quando si è invisibile"
 
@@ -3902,39 +3902,39 @@ msgstr "_Disconnetti"
 msgid "_Change Status Message"
 msgstr "_Cambia messaggio di stato"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "L'autorizzazione è stata inviata"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Ora \"%s\" conoscerà il tuo stato."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "La richiesta di abbonamento è stata inviata"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" accetta questa richiesta conoscerai il suo stato."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "L'autorizzazione è stata rimossa"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Ora \"%s\" ti vedrà sempre come offline."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Il contatto \"%s\" sarà rimosso dalla tua lista"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3943,7 +3943,7 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3951,37 +3951,37 @@ msgstr ""
 "Eliminando questo contatto ne rimuoverai anche l'autorizzazione. Questi ti "
 "vedrà sempre offline."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Voglio che questo contatto conosca il mio stato dopo la rimozione"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Passphrase richiesta"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Inserire la passphrase della chiave GPG per l'account %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Memorizza passphrase"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passphrase"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Stai partecipando ad una o più chat di gruppo"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3989,20 +3989,20 @@ msgstr ""
 "Impostare lo stato invisibile ti farà disconnettere da queste chat di "
 "gruppo. Diventare veramente invisibile?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Nessun account disponibile"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "È necessario creare un account prima di poter chattare con altri contatti."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Ci sono messaggi non letti"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4010,17 +4010,17 @@ msgstr ""
 "I messaggi saranno disponibili per una lettura successiva solo se la "
 "cronologia è abilitata"
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Da %s nella stanza %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Invia file ad un contatto"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Cambia messaggio di stato..."
 
@@ -4150,25 +4150,25 @@ msgstr ""
 "Questo servizio non ha inviato informazioni dettagliate.\n"
 "È probabilmente vecchio o malfunzionante"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Client:Sconosciuto"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Sconosciuto"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versione %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4176,7 +4176,7 @@ msgstr ""
 "Questo contatto è interessato alle informazioni sulla tua presenza, ma tu "
 "non sei interessato alla sua"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4184,14 +4184,14 @@ msgstr ""
 "Sei interessato alle informazioni sulla presenza di questo contatto, ma lui/"
 "lei non è interessato/a alla tua"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Tu ed il contatto siete reciprocamente interessati alle informazioni sulla "
 "presenza dell'altro"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4199,24 +4199,24 @@ msgstr ""
 "Non sei interessato alla presenza del contatto, e lui/lei non è interessato "
 "alla tua"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Sei in attesa della risposta del contatto alla tua richiesta di abbonamento"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " risorsa con priorità "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Senza una connessione non è possibile pubblicare i dati personali."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Senza una connessione, non è possibile ottenere i dati personali."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr "Informazioni personali"
 
@@ -4901,6 +4901,9 @@ msgstr ""
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Entra in nuova stanza..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Uso: /%s, imposta la modalità compatta nella finestra chat di gruppo"
@@ -4932,9 +4935,6 @@ msgstr "cyan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Aggiorna messaggio del giorno"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Ricerca servizi..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Console _XML..."
 
diff --git a/po/nb/LC_MESSAGES/gajim.po b/po/nb/LC_MESSAGES/gajim.po
index bac51310c..ffffee83b 100644
--- a/po/nb/LC_MESSAGES/gajim.po
+++ b/po/nb/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-08 14:28+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -107,10 +107,10 @@ msgstr "Kryptering avslått"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
@@ -268,7 +268,7 @@ 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:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
@@ -422,16 +422,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Lagre passord"
 
@@ -643,7 +643,7 @@ msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
@@ -860,32 +860,32 @@ msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -949,11 +949,11 @@ msgstr "Denne tjenesten innholer ingen elementer å utforske."
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -1584,11 +1584,11 @@ msgstr "vCard publisering vellykket"
 msgid "Your personal information has been published successfully."
 msgstr "Din personlige informasjon har blitt publisert uten feil."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1598,20 +1598,20 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Vennligst vent mens loggene blir migrert..."
 
@@ -3326,70 +3326,70 @@ msgstr "_Nekt"
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Oppdag Tjenester..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Fil behandler:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Maskin:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Innkommende melding:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Bli med i Nytt Rom"
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Kast ut"
@@ -3791,7 +3791,7 @@ msgstr "Server"
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
@@ -3883,41 +3883,41 @@ msgstr "Logg _av"
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3926,7 +3926,7 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3934,37 +3934,37 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passord setning"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3972,19 +3972,19 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3992,17 +3992,17 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Fra %s i rom %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -4132,25 +4132,25 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Utforsking %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4158,7 +4158,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4166,13 +4166,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4180,23 +4180,23 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abbonerings forespørsel"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Personlig Informasjon"
@@ -4861,6 +4861,9 @@ msgstr ""
 msgid "cyan"
 msgstr "turkis"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Bli med i Nytt Rom"
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
@@ -4892,9 +4895,6 @@ msgstr "turkis"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Oppdater Melding for Dagen"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Oppdag Tjenester..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsoll..."
 
diff --git a/po/nl/LC_MESSAGES/gajim.po b/po/nl/LC_MESSAGES/gajim.po
index 5b749c216..8674613ea 100644
--- a/po/nl/LC_MESSAGES/gajim.po
+++ b/po/nl/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-19 18:44+0100\n"
 "Last-Translator: Stéphan Kochen <stephan@kochen.nl>\n"
 "Language-Team: none\n"
@@ -113,10 +113,10 @@ msgstr "Versleuteling uitgeschakeld"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "niet in het rooster"
@@ -276,7 +276,7 @@ msgstr ""
 "aangepast."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Er is geen verbinding met de server"
 
@@ -432,16 +432,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Account %s wordt verwijdert"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Geef je wachtwoord op voor account %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Sla wachtwoord op"
 
@@ -656,7 +656,7 @@ msgstr "Vul de informatie in van de contactpersoon die je toe wilt voegen"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporten"
@@ -875,32 +875,32 @@ msgstr "%(contact_jid)s is uitgenodigd %(room_jid)s binnen te komen."
 msgid "Comment: %s"
 msgstr "Commentaar: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Kies Geluid"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Alle bestanden"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav Geluiden"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Kies Afbeelding"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Afbeeldingen"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -965,11 +965,11 @@ msgstr "Deze service heeft geen onderdelen om te doorbladeren."
 msgid "Re_gister"
 msgstr "Re_gistreer"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Binnengaan"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "Be_werken"
 
@@ -1607,11 +1607,11 @@ msgstr "vCard publicatie is met succes afgerond"
 msgid "Your personal information has been published successfully."
 msgstr "Je persoonlijke informatie is met succes gepubliceerd."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "vCard publicatie is mislukt"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1621,20 +1621,20 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Kan je instellingen en voorkeuren niet opslaan"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sessiebeheer ondersteuning is niet beschikbaar (gnome.ui module ontbreekt)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Logboeken worden omgezet..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Een ogenblik geduld terwijl je logboeken omgezet worden..."
 
@@ -3355,70 +3355,70 @@ msgstr "_Weigeren"
 msgid "_Discover Services"
 msgstr "Ontdek Services"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "Ontdek Services..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Bestandsbeheerder:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Afronden"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Lettertype:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Groupsgesprek"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Hulp"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "Verkeerd gespelde woorden _markeren"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Geschiedenis"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Negeer gebeurtenissen van contacten die niet op mijn rooster staan"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Binnenkomend bericht:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "Nieuwe Ruimte Binnengaan..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "Uit_schoppen"
@@ -3821,7 +3821,7 @@ msgstr "Server"
 msgid "You are already in room %s"
 msgstr "Je bent al in ruimte %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Je kunt een ruimte niet binnengaan terwijl je onzichtbaar bent"
 
@@ -3913,39 +3913,39 @@ msgstr "Log _uit"
 msgid "_Change Status Message"
 msgstr "_Wijzig Statusbericht"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Machtiging is verzonden"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "\"%s\" zal nu je status ontvangen."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Abonneringsverzoek is verzonden"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Als \"%s\" dit verzoek aanneemt zal je zijn status kunnen ontvangen."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Machtiging is verwijdert"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "\"%s\" zal je nu altijd als offline zien."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contact \"%s\" zal van je rooster verwijdert worden"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3954,7 +3954,7 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3962,37 +3962,37 @@ msgstr ""
 "Door deze contact te verwijderen zal je ook zijn toestemming opzeggen om jou "
 "status te zien. Hij/Zij zal jou altijd als offline zien."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Ik wil dat deze contact mijn status blijf zien na verwijdering"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Wachtwoord Vereist"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Geef het wachtwoord op van de GPG sleutel voor account %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Sla wachtwoord op"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Wachtwoord"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Je neem deel aan een of meerdere groepsgesprekken"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -4001,21 +4001,21 @@ msgstr ""
 "groepsgesprekken verbroken worden. Weet je zeker dat je naar onzichtbaar "
 "wilt gaan?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Geen account beschikbaar"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Je moet een account aanmaken voor je gesprekken kunt voeren met andere "
 "contacten."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Je hebt ongelezen berichten"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4023,17 +4023,17 @@ msgstr ""
 "Berichten zullen alleen voor later beschikbaar zijn als de geschiedenis "
 "ingeschakeld is."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Van %s in ruimte %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Stuurt een bestand aan contact"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Wijzig Statusbericht..."
 
@@ -4163,25 +4163,25 @@ msgstr ""
 "Deze service kon niet antwoorde met gedetaileerde informatie.\n"
 "Het is waarschijnlijk veroudert of kapot"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Client:Onbekend"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS:Onbekend"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Doorbladeren van %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4189,7 +4189,7 @@ msgstr ""
 "Deze contact is geïnteresseert in jou aanwezigheid, maar jij niet in zijn/"
 "haar aanwezigheid"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4197,38 +4197,38 @@ msgstr ""
 "Je bent geïnteresseert in de contact z'n aanwezigheid, maar hij/zij niet in "
 "jouw aanwezigheid"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Jij en de contact zijn beide geïnteresseert in elkaars aanwezigheid"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Jij en de contact zijn beide niet geïnteresseert in elkaars aanwezigheid"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Je bent aan het wachten op bevestiging van jou op abonnement op deze contact"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " bron met prioriteit"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie te publiceren zonder verbinding."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Het is niet mogelijk je contact informatie op te halen zonder verbinding."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Persoonlijke Informatie"
@@ -4902,6 +4902,9 @@ msgstr ""
 msgid "cyan"
 msgstr "cyaan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "Nieuwe Ruimte Binnengaan..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Gebruik: /%s, zet het groepsgespreksvenster op compacte modus."
 
@@ -4932,9 +4935,6 @@ msgstr "cyaan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Bericht van de Dag Bijwerken"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "Ontdek Services..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Console..."
 
diff --git a/po/no/LC_MESSAGES/gajim.po b/po/no/LC_MESSAGES/gajim.po
index bac51310c..ffffee83b 100644
--- a/po/no/LC_MESSAGES/gajim.po
+++ b/po/no/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-08 14:28+0100\n"
 "Last-Translator: Stian B. Barmen <stian@barmen.nu>\n"
 "Language-Team: \n"
@@ -107,10 +107,10 @@ msgstr "Kryptering avslått"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "ikke i kontaktliste"
@@ -268,7 +268,7 @@ 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:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Du er ikke tilkoblet til serveren"
 
@@ -422,16 +422,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Fjerner %s kontoen"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Krever Passord"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv inn passord for kontoen %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Lagre passord"
 
@@ -643,7 +643,7 @@ msgstr "Vennligst fyll inn dataene til kontakten du ønsker å legge til"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
@@ -860,32 +860,32 @@ msgstr "Invitert %(contact_jid)s til %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Velg Lyd"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav Lyder"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Velg Bilde"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -949,11 +949,11 @@ msgstr "Denne tjenesten innholer ingen elementer å utforske."
 msgid "Re_gister"
 msgstr "Re_gistrer"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Bli med"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Rediger"
 
@@ -1584,11 +1584,11 @@ msgstr "vCard publisering vellykket"
 msgid "Your personal information has been published successfully."
 msgstr "Din personlige informasjon har blitt publisert uten feil."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "vCard publisering feilet"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1598,20 +1598,20 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Kan ikke lagre dine instillinger og valg"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Sesjons Administrasjons støtte ikke tilgjengelig (mangler gnome.ui modul)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migrerer Logger..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Vennligst vent mens loggene blir migrert..."
 
@@ -3326,70 +3326,70 @@ msgstr "_Nekt"
 msgid "_Discover Services"
 msgstr "_Oppdag Tjenester"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Oppdag Tjenester..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Fil behandler:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Avslutt"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Gruppe Samtale"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Uthev feilstavede ord"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historie"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Maskin:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorer hendelser fra kontakter som ikke er i kontaktlisten"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Innkommende melding:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Bli med i Nytt Rom"
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Kast ut"
@@ -3791,7 +3791,7 @@ msgstr "Server"
 msgid "You are already in room %s"
 msgstr "Du er allerede i rom %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan ikke gå inn i en gruppesamtale når du er usynlig"
 
@@ -3883,41 +3883,41 @@ msgstr "Logg _av"
 msgid "_Change Status Message"
 msgstr "_Endre Status Melding"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Godkjenning har blitt sendt"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nå vil \"%s\" kunne se din status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Abbonerings forespørsel er sendt"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Dersom \"%s\" aksepterer denne forespørselen vil du få vite hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Godkjenning har blitt fjernet"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nå vil \"%s\" alltid se deg som frakoblet."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" vil fjernes fra din kontaktliste"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3926,7 +3926,7 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3934,37 +3934,37 @@ msgstr ""
 "Ved å fjerne denne kontakten fjerner du også godkjenningen som resulterer i "
 "at han eller henne alltid vil se deg som frakoblet."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Denne kontakten skal kunne se min status etter fjerning"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Passordsetning Kreves"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv OpenPGP nøkkel passordsetning for konto %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Lagre passordsetning"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passord setning"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Du er med i en eller flere gruppesamtaler"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3972,19 +3972,19 @@ msgstr ""
 "Endring av status til usynlig vil resultere i at du forlater disse gruppe "
 "samtalene. Er du sikker på at du ønsker å bli usynlig?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Ingen konto tilgjengelig"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Du har uleste meldinger"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3992,17 +3992,17 @@ msgstr ""
 "Meldinger vil kun være tilgjengelig for lesing senere dersom du har "
 "historikk påslått."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Fra %s i rom %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Sender fil til en kontakt"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Endre Status Melding..."
 
@@ -4132,25 +4132,25 @@ msgstr ""
 "Denne tjenesten kunne ikke svare med detaljert informasjon.\n"
 "Den er sannsynligvis utdatert eller ødelagt"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Client:Ukjent"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS:Ukjent"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Utforsking %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4158,7 +4158,7 @@ msgstr ""
 "Denne kontakten er interessert i din tilstedeværelses informasjon, men du er "
 "ikke interessert i hans/hennes status."
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4166,13 +4166,13 @@ msgstr ""
 "Du er interessert i denne kontaktens tilstedeværelses informasjon, men han/"
 "hun er ikke interessert i din."
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Du og kontakten er interessert i hverandres tilstedeværelses informasjon"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4180,23 +4180,23 @@ msgstr ""
 "Du er ikke interessert i kontaktens tilstedeværelses informasjon, ei heller "
 "han/hun i din."
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du venter på kontaktens svar på din abbonerings forespørsel"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " ressurs med prioritet"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Uten en tilkobling kan du ikke publisere din kontakt informasjon."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Uten en tilkobling kan du ikke hente din kontakt informasjon."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Personlig Informasjon"
@@ -4861,6 +4861,9 @@ msgstr ""
 msgid "cyan"
 msgstr "turkis"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Bli med i Nytt Rom"
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Bruksanvisning: /%s, setter gruppesamtale vinduet til kompakt modus."
@@ -4892,9 +4895,6 @@ msgstr "turkis"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Oppdater Melding for Dagen"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Oppdag Tjenester..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Konsoll..."
 
diff --git a/po/pl/LC_MESSAGES/gajim.po b/po/pl/LC_MESSAGES/gajim.po
index 35b3aa9b6..8477b86d0 100644
--- a/po/pl/LC_MESSAGES/gajim.po
+++ b/po/pl/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim 2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-11 20:51+0100\n"
 "Last-Translator: Witek Kieraś <pambuk@gmail.com>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -113,10 +113,10 @@ msgstr "Szyfrowanie wyłączone"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "spoza listy kontaktów"
@@ -274,7 +274,7 @@ 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:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Nie jesteś połączony z serwerem"
 
@@ -429,16 +429,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Usuwanie konta %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Wymagane hasło"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Wpisz hasło dla konta %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Zapisz hasło"
 
@@ -648,7 +648,7 @@ msgstr "Wypełnij informacje o kontakcie, który chcesz dodać."
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporty"
@@ -865,32 +865,32 @@ msgstr "%(contact_jid)s zaproszony do %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Komentarz: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Wybierz dźwięk"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Wszystkie pliki"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Dźwięki w Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Wybierz obrazek"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Obrazki"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -954,11 +954,11 @@ msgstr "Usługa nie zawiera elementów, które można przeglądać."
 msgid "Re_gister"
 msgstr "Za_rejestruj"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Dołącz"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Modyfikuj"
 
@@ -1589,11 +1589,11 @@ msgstr "Publikacja vCard powiodła się"
 msgid "Your personal information has been published successfully."
 msgstr "Informacje o tobie zostały opublikowane."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Publikacja vCard nie powiodła się"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1603,19 +1603,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Nie można zapisać twoich ustawień i opcji."
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Wsparcie dla Menadżera Sesji jest niedostępne (brak modułu gnome.ui"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Przenoszenie Logów..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Proszę poczekać na przeniesienie logów..."
 
@@ -3324,70 +3324,70 @@ msgstr "O_dmów"
 msgid "_Discover Services"
 msgstr "_Wyszukuj Usługi"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Wyszukuj Usługi..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Menadżer plików:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtr:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Zakończ"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Czcionka:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Pokój"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "Podś_wietlaj błędy w pisowni"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historia"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignoruj wiadomości od osób spoza listy kontaktów"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Wiadomość otrzymana:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Dołącz do Nowego pokoju..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "Wy_rzuć"
@@ -3792,7 +3792,7 @@ msgstr "Serwer"
 msgid "You are already in room %s"
 msgstr "Już jesteś w pokoju %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Nie możesz dołączyć do pokoju gdy jesteś niewidoczny"
 
@@ -3884,41 +3884,41 @@ msgstr "R_ozłącz"
 msgid "_Change Status Message"
 msgstr "_Zmień Opis Statusu"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autoryzacja została wysłana"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Teraz \"%s\" będzie znał Twój status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Prośba o autoryzację została wysłana."
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Jeśli \"%s\" zaakceptuje tę prośbę, to będziesz mógł widzieć jego lub jej "
 "status."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autoryzacja została cofnięta"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Teraz \"%s\" zawsze będzie cię widział jako Rozłączonego."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, 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:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3927,7 +3927,7 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako Rozłączonego."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3935,37 +3935,37 @@ msgstr ""
 "Usuwając kontakt usuniesz również autoryzację, co spowoduje, że kontakt "
 "będzie zawsze widział Cię jako Rozłączonego."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Chcę żeby po usunięciu ten kontakt znał mój status"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Wymagane hasło"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Wpisz hasło GPG dla konta %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Zapisz hasło"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Hasło"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Znajdujesz się w jednym lub kilku pokojach"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3973,19 +3973,19 @@ msgstr ""
 "Zmiana statusu na Niewidoczny spowoduje rozłaczeniem z tym pokojami. Czy na "
 "pewno chcesz stać się niewidoczny?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Żadne konto nie jest dostępne"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 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:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Masz nieprzeczytane wiadomości"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -3993,17 +3993,17 @@ msgstr ""
 "Wiadomości będą dostępne tylko do czytania, o ile masz włączoną obsługę "
 "historii."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Od %s w pokoju %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Wysyła plik kontaktowi"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Zmień Opis Statusu..."
 
@@ -4137,25 +4137,25 @@ msgstr ""
 "Ta usługa nie była w stanie odesłać szczegółowych informacji.\n"
 "Prawdopodobnie została zamknięta lub jest zepsuta"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Klient: Nieznany"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?System operacyjny: Nieznany"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Przeglądanie %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4163,7 +4163,7 @@ msgstr ""
 "Ten kontakt jest zaintersowany informacjami o twoim statusie, ale ty nie "
 "interesujesz się jego/jej statusem."
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4171,12 +4171,12 @@ msgstr ""
 "Jesteś zainteresowany informacjami o statusie tego kontaktu, ale on/ona nie "
 "jest zainteresowana twoim."
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Oboje jesteście zaintersowani nawzajem swoimi informacjami o statusie"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4184,23 +4184,23 @@ msgstr ""
 "Nie jesteś zainteresowany informacjami o statusie kontaktu i on również nie "
 "jest zainteresowany twoim"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Oczekujesz na odpowiedź kontaktu dotyczącą prośby o autoryzację"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " zasób o wysokim priorytecie "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Nie możesz wysłać informacji o sobie jeśli nie jesteś połączony."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Musisz być połączony by uzyskać informacje o kontakcie."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Informacje osobiste"
@@ -4877,6 +4877,9 @@ msgstr ""
 msgid "cyan"
 msgstr "cyjan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Dołącz do Nowego pokoju..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Użycie: /%s przestawia okno rozmowy w pokoju na widok zwarty."
 
@@ -4907,9 +4910,6 @@ msgstr "cyjan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Uktualnij Wiadomość Dnia"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Wyszukuj Usługi..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Konsola _XML..."
 
diff --git a/po/pt/LC_MESSAGES/gajim.po b/po/pt/LC_MESSAGES/gajim.po
index d5d8c2dce..e17edc380 100644
--- a/po/pt/LC_MESSAGES/gajim.po
+++ b/po/pt/LC_MESSAGES/gajim.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-08-18 18:21-0300\n"
 "Last-Translator: Miguel Fonseca <miguelcsf@gmail.com>\n"
 "Language-Team: none\n"
@@ -107,10 +107,10 @@ msgstr "Encriptação desactivada"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Fora da lista"
@@ -268,7 +268,7 @@ msgid "You must create your account before editing your personal information."
 msgstr "Deve primeiro criar sua conta antes de editar suas informações"
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Não está ligado ao servidor"
 
@@ -422,16 +422,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Senha Necessária"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Introduza a sua senha para a conta %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Guardar senha"
 
@@ -645,7 +645,7 @@ msgstr "Por favor preencha os dados do contacto que deseja adicionar"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
@@ -863,32 +863,32 @@ msgstr "%(contact_jid)s foi convidado(a) para %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Todos os ficheiros"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Escolha chave"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -952,11 +952,11 @@ msgstr "Este serviço não contém quaisquer itens para explorar"
 msgid "Re_gister"
 msgstr "Re_gistar"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Entrar"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1596,11 +1596,11 @@ msgstr "Publicação vCard deu-se com sucesso"
 msgid "Your personal information has been published successfully."
 msgstr "As suas informações pessoais foram publicadas com sucesso."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Publicação vCard falhou"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1610,19 +1610,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar as suas definições e preferências"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management não é suportado (módulo gnome.ui em falta)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Fazendo a 'migração' dos logs..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr ""
 "Por favor, aguarde enquanto que a migração dos seus registos de conversas é "
@@ -3345,70 +3345,70 @@ msgstr "_Negar"
 msgid "_Discover Services"
 msgstr "_Descobrir Recursos"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Descobrir Recursos..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gestor de ficheiros:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Terminar"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Letra:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "C_hat"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal soletradas"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IC"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorar eventos de contactos que não estão na lista"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Juntar-se a uma Nova Sala..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Expulsar"
@@ -3810,7 +3810,7 @@ msgstr "Servidor"
 msgid "You are already in room %s"
 msgstr "Já está na sala %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Não pode entrar numa sala quando está invisível"
 
@@ -3902,39 +3902,39 @@ msgstr "_Desligar"
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Estado"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá o seu estado."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Pedido de subscrição foi enviado"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar este pedido, você passará a saber o seu estado."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Doravante, \"%s\" vê-lo-á sempre como estando offline."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contacto \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3943,7 +3943,7 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3951,37 +3951,37 @@ msgstr ""
 "Ao remover este contacto, também remove a autorização. O contacto vê-lo-á "
 "sempre como offline."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Quero que este contacto saiba o meu estado depois da remoção"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Frase de acesso Necessária"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Introduza a chave GPG para a conta %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Guardar frase de acesso"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Está a participar num ou mais chats"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3989,36 +3989,36 @@ msgstr ""
 "Mudar o seu estado para invisível fará com que seja desligado desses chats. "
 "De certeza que deseja tornar-se invisível?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Nenhuma conta disponível"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Tem de criar uma conta antes de poder conversar com outros contactos."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Tem mensagens não lidas"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr ""
 "As mensagens só poderão ser lidas mais tarde caso tenha o histórico activado."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s na sala %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Envia um ficheiro a um contacto"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Estado..."
 
@@ -4148,25 +4148,25 @@ msgstr ""
 "Este serviço/recurso não pôde responder com informações detalhadas.\n"
 "Provavelmente está legacy ou broken"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Versão %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4174,7 +4174,7 @@ msgstr ""
 "Este contacto está interessado/a na suas informações de presença, mas você "
 "não está interessado na dele/a"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4182,36 +4182,36 @@ msgstr ""
 "Está interessado nas informações de presença do contacto, mas ele/ela não "
 "está na sua"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contacto estão interessados nas informações de presença um do outro"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Não está interessado na presença do contacto, nem ele/ela está na sua"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Está à espera da resposta do contacto sobre o seu pedido de subscrição"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr ""
 "É necessária uma ligação para poder publicar as suas informações de contacto."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "É necessária uma ligação para receber as suas informações de contacto."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Detalhes Pessoais..."
@@ -4879,6 +4879,9 @@ msgstr ""
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Juntar-se a uma Nova Sala..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Uso: /%s, muda a janela de chat para o modo compacto."
 
@@ -4909,9 +4912,6 @@ msgstr "cyan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Actualizar Mensagem do Dia"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Descobrir Recursos..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Consola _XML..."
 
diff --git a/po/pt_BR/LC_MESSAGES/gajim.po b/po/pt_BR/LC_MESSAGES/gajim.po
index 098d80aa6..6150c903c 100644
--- a/po/pt_BR/LC_MESSAGES/gajim.po
+++ b/po/pt_BR/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim 0.81\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-11 14:06-0300\n"
 "Last-Translator: Alfredo Jr. (junix) <junix@targetlinux.org>\n"
 "Language-Team: none\n"
@@ -110,10 +110,10 @@ msgstr "Criptografia desabilitada"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Fora da lista"
@@ -272,7 +272,7 @@ msgstr ""
 "Você deve primeiro criar sua conta antes de editar suas informações pessoais."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Você não está conectado ao servidor"
 
@@ -426,16 +426,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Removendo %s conta"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Senha é obrigatória"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Entre com a senha para conta %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Salvar senha"
 
@@ -649,7 +649,7 @@ msgstr "Por favor preencha os dados do contato que você quer adicionar"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transportes"
@@ -869,32 +869,32 @@ msgstr "Convidado %(contact_jid)s para %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Comentário: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Escolher Som"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Todos os arquivos"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Sons Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Escolha imagem"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Imagens"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -958,11 +958,11 @@ msgstr "Este serviço não contém nenhum item para navegar."
 msgid "Re_gister"
 msgstr "Re_gistrar"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Ingressar"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Editar"
 
@@ -1593,11 +1593,11 @@ msgstr "Publicação do vCard bem sucedida"
 msgid "Your personal information has been published successfully."
 msgstr "Suas informações pessoais foram publicadas com sucesso."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Publicação do vCard falhou"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1606,21 +1606,21 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Impossível salvar suas preferências"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Suporte de gerenciamento da sessão não disponível (faltando o módulo gnome."
 "ui)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migrando Logs..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Espere por favor, enquanto os registros estão sendo migrados..."
 
@@ -3335,70 +3335,70 @@ msgstr "_Negar"
 msgid "_Discover Services"
 msgstr "_Descubra Serviços"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Descubra Serviços..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Gerenciamento de arquivos:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filtro:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Encerrar"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Fonte:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Conferência"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Destacar palavras mal escritas"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Histórico"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Host:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignore eventos de contatos que não estejam na minha lista"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Mensagem recebida:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Ingressar Nova Sala..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Chutar"
@@ -3801,7 +3801,7 @@ msgstr "Servidor"
 msgid "You are already in room %s"
 msgstr "Você já está na sala %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Você não pode ingressar em uma sala enquanto está invisível"
 
@@ -3892,39 +3892,39 @@ msgstr "_Desconectar"
 msgid "_Change Status Message"
 msgstr "_Mudar Mensagem de Status"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autorização foi enviada"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Agora \"%s\" saberá seu status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Solicitação de inscrição foi enviada"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Se \"%s\" aceitar esta solicitação, você saberá o status dele ou dela."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autorização foi removida"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Agora \"%s\" você sempre o verá como offline."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Contato \"%s\" será removido de sua lista"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3933,7 +3933,7 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3941,37 +3941,37 @@ msgstr ""
 "Removendo este contato, você também, por padrão, removerá a autorização, "
 "resultando em ele ou ela sempre o verá offiline."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Eu quero que este contato saiba meu status após a remoção"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Frase de acesso é obrigatória"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Entre com a chave GPG para conta %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Salvar Frase de acesso"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Frase de acesso"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Você está participando em uma ou mais conferências"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3979,20 +3979,20 @@ msgstr ""
 "Mudando seu status para invisível resulta na desconexão daquelas "
 "conferências.  Você tem certeza que quer ir invisível?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Conta não disponível"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Você deve configurar uma conta antes de poder conversar com outros contatos."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Você tem mensagens não lidas"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4000,17 +4000,17 @@ msgstr ""
 "Mensagem somente estará disponível para leitura mais tarde se você tiver o "
 "histórico habilitado."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "De %s na sala %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Enviar arquivo para um contato"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Mudar Mensagem de Status..."
 
@@ -4140,25 +4140,25 @@ msgstr ""
 "Este serviço não poderia responder com informações detalhadas.\n"
 "É mais provável quebrado"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Cliente:Desconhecido"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?SO:Desconhecido"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Navegando %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4166,7 +4166,7 @@ msgstr ""
 "Este contato está interessado em sua informação de presença, mas você não "
 "está interessado napresença dele/dela"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4174,13 +4174,13 @@ msgstr ""
 "Você está interessado na informação da presença do contato, mas ele/ela não "
 "está interessado em seu"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Você e o contato estão interessados em cada outra informação da presença"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4188,24 +4188,24 @@ msgstr ""
 "Você não está interessado na presença do contato, e nenhum está interessado "
 "no seu"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr ""
 "Você está esperando a resposta do contato sobre seu pedido da subscrição"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " recurso com prioridade "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Você deve estar conectado para publicar suas informações de contato."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Você deve estar conectado para receber suas informações de contato."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Informações Pessoais"
@@ -4874,6 +4874,9 @@ msgstr ""
 msgid "cyan"
 msgstr "ciano"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Ingressar Nova Sala..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Uso: /%s, configura a janela de conferência para modo compacto."
 
@@ -4904,9 +4907,6 @@ msgstr "ciano"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Atualiza Mensagem do Dia"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Descubra Serviços..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "Console _XML..."
 
diff --git a/po/ru/LC_MESSAGES/gajim.po b/po/ru/LC_MESSAGES/gajim.po
index d70c8cc0b..9a0ba75fd 100644
--- a/po/ru/LC_MESSAGES/gajim.po
+++ b/po/ru/LC_MESSAGES/gajim.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-20 13:48+0000\n"
 "Last-Translator: Yakov Bezrukov <bezrukov@isp.nsc.ru>\n"
 "Language-Team:  <ru@li.org>\n"
@@ -117,10 +117,10 @@ msgstr "Шифрование отключено"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "не в ростере"
@@ -280,7 +280,7 @@ msgstr ""
 "запись."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Вы не подключены к серверу"
 
@@ -435,16 +435,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Удаление учетной записи %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Требуется Пароль"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Введите пароль для учетной записи %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Сохранить пароль"
 
@@ -658,7 +658,7 @@ msgstr "Пожалуйста, заполните данные для конта�
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Транспорты"
@@ -873,32 +873,32 @@ msgstr "Пригласил %(contact_jid)s в %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Комментарий: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Выберите Звуковой Файл"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Все файлы"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "В Формате Wav"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Выбрать Картинку"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Картинки"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -962,11 +962,11 @@ msgstr "Этот сервис не содержит ничего, что мож�
 msgid "Re_gister"
 msgstr "Пере_регистрировать"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Присоединиться"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Правка"
 
@@ -1602,11 +1602,11 @@ msgstr "vCard успешно опубликован"
 msgid "Your personal information has been published successfully."
 msgstr "Ваша информация о себе была успешно опубликована."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "Публикация vCard не удалась"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1615,20 +1615,20 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Не могу сохранить ваши установки и настройки"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr ""
 "Отсутствует поддержка Управления Сессиями (отсутствует модуль gnome.ui)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Переношу Историю..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Пожалуйста, дождитесь окончания переноса истории..."
 
@@ -3342,70 +3342,70 @@ msgstr "_Отклонить"
 msgid "_Discover Services"
 msgstr "_Просмотреть Сервисы"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Просмотреть Сервисы..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_ЧаВО"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Менеджер файлов:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Фильтр:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Закончить"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Шрифт:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Комната"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Помощь"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "Выделять _слова с опечатками"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_История"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Хост: "
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Игнорировать события от контактов не из ростера"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Входящее сообщение:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Войти в Новую Комнату..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Выгнать"
@@ -3809,7 +3809,7 @@ msgstr "Сервер"
 msgid "You are already in room %s"
 msgstr "Вы уже в комнате %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Вы не можете зайти в комнату так как вы в режиме невидимости."
 
@@ -3901,39 +3901,39 @@ msgstr "_Отключиться"
 msgid "_Change Status Message"
 msgstr "_Изменить Сообщение о Статусе"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Была отправлена авторизация"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Теперь \"%s\" будет знать о вашем статусе."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Был отправлен запрос на подписку "
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Если \"%s\" примет ваш запрос, вы будете знать его или её статус"
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Авторизация была удалена"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Теперь \"%s\" всегда будет видеть вас в оффлайне."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Контакт \"%s\" будет удален из вашего ростера"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3942,7 +3942,7 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3950,37 +3950,37 @@ msgstr ""
 "Если вы удалите контакт, вы так же удалите и авторизацию. Вы будете видеть "
 "его или её всегда в оффлайне."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Я хочу чтобы этот контакт видел мой статус после удаления"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Требуется Парольная Фраза"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Введите парольную фразу GPG ключа для %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Сохранить парольную фразу (небезопасно)"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Парольная фраза"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Вы находитесь в одной или более комнатах"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3988,20 +3988,20 @@ msgstr ""
 "Переход в состояние невидимости приведет к выходу из этих комнат. Вы точно "
 "хотите стать в невидимым?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Неи доступной учетной записи"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Для начала беседы с другими людьми прежде необходимо создать учетную запись."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "У вас есть непрочитанные сообщения"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4009,17 +4009,17 @@ msgstr ""
 "Сообщения будут доступны для чтения позже если у вас активирована опция "
 "истории."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "От %s в комнате %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Отправляет контакту файл"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Изменить Сообщение о Статусе..."
 
@@ -4153,25 +4153,25 @@ msgstr ""
 "Этот сервис не может предоставить информацию о себе . \n"
 "Похоже что он или неверно настроен или сломан"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "Неизвестен"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "Неизвестна"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Просматриваю %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4179,7 +4179,7 @@ msgstr ""
 "Этот контакт хочет знать о вашем присутствии, но вам информация о его или её "
 "присутствии не интересна"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4187,35 +4187,35 @@ msgstr ""
 "Вам хочется получать информацию о присутствии контакта, но он или она не "
 "заинтересована в вашей."
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Вы и контакт оба желаете знать о присутствии друг друга"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "Ни вы ни ваш контакт не желаете знать о присутствии друг друга"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Вы ожидаете ответа контакта на запрос на подписку"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " ресурс с приоритетом "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Необходимо присоединиться к серверу для обновления личной информации"
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr ""
 "Необходимо присоединиться к серверу для получения информации о контакте"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "Редактировать Личную Информацию"
@@ -4884,6 +4884,9 @@ msgstr ""
 msgid "cyan"
 msgstr "синий"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Войти в Новую Комнату..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Использование: /%s, переводит окно комнаты в компактный режим."
 
@@ -4914,9 +4917,6 @@ msgstr "синий"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Обновить фортунку"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Просмотреть Сервисы..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML Консоль..."
 
diff --git a/po/sk/LC_MESSAGES/gajim.po b/po/sk/LC_MESSAGES/gajim.po
index ffc5c74dc..daac2bec1 100644
--- a/po/sk/LC_MESSAGES/gajim.po
+++ b/po/sk/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2006-02-26 09:18+0100\n"
 "Last-Translator: Juraj Michalek <juraj.michalek@asinus.org>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -112,10 +112,10 @@ msgstr "Šifrovanie vypnuté"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "nie je v zozname"
@@ -273,7 +273,7 @@ msgstr ""
 "Musíte si vytvoriť účet, predtým než budete môcť meniť osobné informácie."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Nie ste pripojený na server"
 
@@ -430,16 +430,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Odstrániť %s účet"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Heslo je požadované"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Vložte heslo pre váš účet %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Uložiť heslo"
 
@@ -652,7 +652,7 @@ msgstr "Prosím vyplnte údaje o kontakte, ktorý chcete pridať"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transport"
@@ -871,32 +871,32 @@ msgstr "Pozvaný(á) %(contact_jid)s do %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Komentár: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Vybrať zvuk"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Všetky súbory"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav zvuk"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Vyberte obrázok"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Obrázky"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -960,11 +960,11 @@ msgstr "Táto služba neobsahuje žiadne položky."
 msgid "Re_gister"
 msgstr "Re_gistrácia"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Pripojiť"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "_Upraviť"
 
@@ -1593,11 +1593,11 @@ msgstr "zverejnenie vCard úspešné"
 msgid "Your personal information has been published successfully."
 msgstr "Vaše osobné informácie boli úspešne zverejnené."
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "zverejnenia vCard zlyhalo"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1606,19 +1606,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Nie je možné uložiť nastavenia."
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Podpora Správy sedenia nie je dostupná (chýba gnome.ui modul)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Presun záznamov histórie..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Prosím počkajte, pokým prebieha migrácia záznamov z komunikácie..."
 
@@ -3327,70 +3327,70 @@ msgstr "_Zakázať"
 msgid "_Discover Services"
 msgstr "_Preskúmať služby"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Preskúmať služby..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_Často kladené otázky"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Správca súborov:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Dokončiť"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Font:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "Skupinový rozhovor"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Zvýrazniť zle napísané slová"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_História"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Server:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorovať udalosti od kontaktov, ktorí nie sú v zozname"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Prichádzajúca správa:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "_Pripojiť sa do novej miestnosti..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Vykopnúť"
@@ -3794,7 +3794,7 @@ msgstr "Pozorovatelia"
 msgid "You are already in room %s"
 msgstr "Už ste v miestnosti %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Nemôžete sa pripojiť do miestnosti, pokiaľ ste neviditeľný(á)"
 
@@ -3886,39 +3886,39 @@ msgstr "_Odhlásiť"
 msgid "_Change Status Message"
 msgstr "_Zmeniť správu o stave"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Autorizácia bola odoslaná"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Od teraz  bude \"%s\" vidieť váš stav."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Žiadosť o zapísanie bola odoslaná"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "Ak \"%s\" akceptuje túto požiadavku, budete vidieť jeho/jej stav."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Autorizácia bola odstránená"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Odteraz \"%s\" vás uvidí len v stave offline."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" bude odstránený zo zoznamu"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3927,7 +3927,7 @@ msgstr ""
 "Odstránením tohoto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona/on vás vždy uvidí ako offline."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3935,37 +3935,37 @@ msgstr ""
 "Odstránením tohoto kontaktu, automaticky odstránite aj autorizáciu, to "
 "znamená, že ona/on vás vždy uvidí ako offline."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "Chcem upozorniť kontakt, na to, že bol odstránený"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Passfráza je požadovaná"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Vložiť passfrázu GPG kľúč pre účet %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Uložiť passfrázu"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Passfráza"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Ste v jednej alebo viacerých diskusných skupinách"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3974,36 +3974,36 @@ msgstr ""
 "skupinových diskusií. Ste si skutočne istý(á), že chcete zmeniť stav na "
 "neviditeľný?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Žiadne účty nie sú dostupné"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr ""
 "Musíte si vytvoriť účet predtým, než budete môcť komunikovať s ostatnými."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Máte neprečítané správy"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "Správu bude možné prečítať, ak máte povolenú históriu."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Od %s v miestnosti %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Poslať súbor kontaktu"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Zmeniť Správu o stave..."
 
@@ -4137,25 +4137,25 @@ msgstr ""
 "Táto služba neodpovedala podrobnejšími informáciami.\n"
 "Je pravdepodobne zastaralá alebo poškodená"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Klient: Neznámy"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS:Neznámy"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Prechádzanie %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4163,7 +4163,7 @@ msgstr ""
 "Tento kontakt sa zaujíma o vaše informácie o prítomnosti, ale vy sa "
 "nezaujímate o jeho/jej informácie o prítomnosti"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4171,14 +4171,14 @@ msgstr ""
 "Zaujímate sa o informácie o prítomnosti vášho kontaktu, ale on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr ""
 "Vy aj váš kontakt sa vzájomne zaujímate o informácie o vašej a jeho/jej "
 "prítomnosti"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
@@ -4186,23 +4186,23 @@ msgstr ""
 "Nezaujímate sa o informácie o prítomnosti vášho kontaktu a ani on/ona sa "
 "nezaujíma o vaše"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Čakáte na odpoveď od kontaktu - ohľadne vašej požiadavky na zápis"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr "priorita zdroja"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Bez pripojenie nemôžete publikovať informácie o vašom kontakte."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Bez pripojenia, nemôžete získať informácie o kontakte."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr "Osobné detaily"
 
@@ -4881,6 +4881,9 @@ msgstr ""
 msgid "cyan"
 msgstr "azúrová"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "_Pripojiť sa do novej miestnosti..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr ""
 #~ "Použitie: /%s, nastaví okno pre skupinový rozhovor do kompaktného módu."
@@ -4912,9 +4915,6 @@ msgstr "azúrová"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Aktualizovať Správu dňa"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Preskúmať služby..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML konzola"
 
diff --git a/po/sv/LC_MESSAGES/gajim.po b/po/sv/LC_MESSAGES/gajim.po
index 1ba5d9a2f..cafdebfd8 100644
--- a/po/sv/LC_MESSAGES/gajim.po
+++ b/po/sv/LC_MESSAGES/gajim.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2006-03-07 04:49+0100\n"
 "Last-Translator: Oscar Hellström <oscar@oscarh.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -112,10 +112,10 @@ msgstr "Kryptering deaktiverad"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "Inte i registret"
@@ -274,7 +274,7 @@ msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
@@ -429,16 +429,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "Lösenord Krävs"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Skriv in lösenordet för konto %s"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "Spara lösenord"
 
@@ -648,7 +648,7 @@ msgstr "Fyll i informationen om kontakten du vill lägga till"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "Transporter"
@@ -867,32 +867,32 @@ msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -956,11 +956,11 @@ msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "_Anslut till"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -1588,11 +1588,11 @@ msgstr "publicering av vCard lyckades"
 msgid "Your personal information has been published successfully."
 msgstr "Din personliga information har blivit publicerad"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "publicering av vCard misslyckades"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1602,19 +1602,19 @@ msgstr ""
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "Session Management-stöd inte tillgängligt (saknar gnome.ui-modul)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "Migrerar Logfiler"
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "Vänligen vänta medans logfiler blir migrerade..."
 
@@ -3333,70 +3333,70 @@ msgstr "_Neka"
 msgid "_Discover Services"
 msgstr "_Upptäck tjänster"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "_Upptäck tjänster"
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "_FAQ"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "Filhanterare:"
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "_Filter:"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "_Slutför"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "Teckensnitt:"
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "_Gruppchatt"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "_Hjälp"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "_Historik"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "_Värd:"
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "_IQ"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "_Ignorera händelser från kontakter som inte finns i registret"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "Inkommande meddelande:"
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "_Jabber-ID:"
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "Anslut till nytt _rum..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "_Sparka ut"
@@ -3799,7 +3799,7 @@ msgstr "Observerande"
 msgid "You are already in room %s"
 msgstr "Du är redan i rummet %s"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "Du kan inte ansluta till ett rum när du är osynlig"
 
@@ -3891,41 +3891,41 @@ msgstr "K_oppla från"
 msgid "_Change Status Message"
 msgstr "Byt _Statusmeddelande"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakt \"%s\" kommer bli borttagen från registret"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
@@ -3934,7 +3934,7 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -3942,39 +3942,39 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "Skriv in GPG-nyckelns lösenfras för konto %s"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "Spara lösenfras"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "Lösenfras"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -3982,19 +3982,19 @@ msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
@@ -4002,17 +4002,17 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "Från %s i rum %s"
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "Skicka fil till en kontakt"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "Byt Statusmeddelande..."
 
@@ -4142,25 +4142,25 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "Bläddrar %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -4168,7 +4168,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -4176,35 +4176,35 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Varken du eller kontakten är intresserad av varandras närvaroinformation"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du väntar på kontaktens svar på din förfrågan om prenumeration"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "Utan en förbindelse kan du inte publicera din kontaktinformation."
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "Utan en förbindelse kan du inte hämta din kontaktinformation."
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 msgid "Personal details"
 msgstr "Personliga detaljer"
 
@@ -4879,6 +4879,9 @@ msgstr ""
 msgid "cyan"
 msgstr "cyan"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "Anslut till nytt _rum..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "Användning: /%s, ställer om ett gruppchatfönster till kompaktvy."
 
@@ -4909,9 +4912,6 @@ msgstr "cyan"
 #~ msgid "Update Message of the Day"
 #~ msgstr "Uppdatera dagens meddelande"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "_Upptäck tjänster"
-
 #~ msgid "_XML Console..."
 #~ msgstr "_XML konsol..."
 
diff --git a/po/zh_CN/LC_MESSAGES/gajim.po b/po/zh_CN/LC_MESSAGES/gajim.po
index 115849597..03f589815 100644
--- a/po/zh_CN/LC_MESSAGES/gajim.po
+++ b/po/zh_CN/LC_MESSAGES/gajim.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-12 12:10+0200\n"
+"POT-Creation-Date: 2006-04-12 16:52+0200\n"
 "PO-Revision-Date: 2005-12-30 09:17+0800\n"
 "Last-Translator: kangkang <kanger@gmail.com>\n"
 "Language-Team: sIyU <jabber@lzusiyu.org>\n"
@@ -111,10 +111,10 @@ msgstr "禁用加密"
 #. show user in not in roster group
 #: ../src/chat_control.py:1152 ../src/conversation_textview.py:373
 #: ../src/dialogs.py:465 ../src/gajim.py:684 ../src/gajim.py:685
-#: ../src/roster_window.py:1309 ../src/roster_window.py:1613
-#: ../src/roster_window.py:1791 ../src/roster_window.py:2090
-#: ../src/roster_window.py:2136 ../src/roster_window.py:2916
-#: ../src/roster_window.py:2918 ../src/systray.py:284
+#: ../src/roster_window.py:1309 ../src/roster_window.py:1615
+#: ../src/roster_window.py:1793 ../src/roster_window.py:2092
+#: ../src/roster_window.py:2138 ../src/roster_window.py:2918
+#: ../src/roster_window.py:2920 ../src/systray.py:284
 #: ../src/common/helpers.py:42 ../src/common/helpers.py:225
 msgid "Not in Roster"
 msgstr "不在名单中"
@@ -270,7 +270,7 @@ msgid "You must create your account before editing your personal information."
 msgstr "您必须在编辑个人信息前创建账户。"
 
 #: ../src/config.py:1365 ../src/dialogs.py:863 ../src/dialogs.py:1009
-#: ../src/disco.py:419 ../src/vcard.py:421 ../src/vcard.py:450
+#: ../src/disco.py:419 ../src/vcard.py:433 ../src/vcard.py:462
 msgid "You are not connected to the server"
 msgstr "尚未连接到服务器"
 
@@ -424,16 +424,16 @@ msgstr ""
 msgid "Removing %s account"
 msgstr "移除账户 %s"
 
-#: ../src/config.py:2144 ../src/roster_window.py:1831
+#: ../src/config.py:2144 ../src/roster_window.py:1833
 msgid "Password Required"
 msgstr "需要密码"
 
-#: ../src/config.py:2145 ../src/roster_window.py:1832
+#: ../src/config.py:2145 ../src/roster_window.py:1834
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "输入帐户 %s 的密码"
 
-#: ../src/config.py:2146 ../src/roster_window.py:1833
+#: ../src/config.py:2146 ../src/roster_window.py:1835
 msgid "Save password"
 msgstr "保存密码"
 
@@ -641,7 +641,7 @@ msgstr "请填入您想增加的联系人数据"
 #: ../src/disco.py:1258 ../src/roster_window.py:188
 #: ../src/roster_window.py:249 ../src/roster_window.py:284
 #: ../src/roster_window.py:304 ../src/roster_window.py:328
-#: ../src/roster_window.py:2912 ../src/roster_window.py:2914
+#: ../src/roster_window.py:2914 ../src/roster_window.py:2916
 #: ../src/systray.py:291 ../src/common/helpers.py:42
 msgid "Transports"
 msgstr "代理"
@@ -860,32 +860,32 @@ msgstr "邀请 %(contact_jid)s 到 %(room_jid)s。"
 msgid "Comment: %s"
 msgstr "注释： %s"
 
-#: ../src/dialogs.py:1549
+#: ../src/dialogs.py:1546
 msgid "Choose Sound"
 msgstr "选择声音"
 
-#: ../src/dialogs.py:1559 ../src/dialogs.py:1605
+#: ../src/dialogs.py:1556 ../src/dialogs.py:1599
 msgid "All files"
 msgstr "全部文件"
 
-#: ../src/dialogs.py:1564
+#: ../src/dialogs.py:1561
 msgid "Wav Sounds"
 msgstr "Wav声音"
 
-#: ../src/dialogs.py:1595
+#: ../src/dialogs.py:1589
 msgid "Choose Image"
 msgstr "选择形象"
 
-#: ../src/dialogs.py:1610
+#: ../src/dialogs.py:1604
 msgid "Images"
 msgstr "形象"
 
-#: ../src/dialogs.py:1656
+#: ../src/dialogs.py:1650
 #, python-format
 msgid "When %s becomes:"
 msgstr ""
 
-#: ../src/dialogs.py:1658
+#: ../src/dialogs.py:1652
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr ""
@@ -947,11 +947,11 @@ msgstr "此服务不包含任何项目可浏览。"
 msgid "Re_gister"
 msgstr "注册(_G)"
 
-#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:349
+#: ../src/disco.py:1154 ../src/disco.py:1516 ../src/gtkgui.glade.h:350
 msgid "_Join"
 msgstr "加入(_J)"
 
-#: ../src/disco.py:1261 ../src/gtkgui.glade.h:333 ../src/roster_window.py:1436
+#: ../src/disco.py:1261 ../src/gtkgui.glade.h:334 ../src/roster_window.py:1436
 msgid "_Edit"
 msgstr "编辑(_E)"
 
@@ -1567,11 +1567,11 @@ msgstr " vCard 发布成功"
 msgid "Your personal information has been published successfully."
 msgstr "您的个人信息被成功发布。"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid "vCard publication failed"
 msgstr "vCard 发布失败"
 
-#: ../src/gajim.py:1298
+#: ../src/gajim.py:1304
 msgid ""
 "There was an error while publishing your personal information, try again "
 "later."
@@ -1579,19 +1579,19 @@ msgstr "发布您的个人信息时发生错误，请稍后重试。"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:1628
+#: ../src/gajim.py:1634
 msgid "Could not save your settings and preferences"
 msgstr "无法保存您的设置。"
 
-#: ../src/gajim.py:1842
+#: ../src/gajim.py:1848
 msgid "Session Management support not available (missing gnome.ui module)"
 msgstr "会话管理器支持不可用(丢失 gnome.ui 模块)"
 
-#: ../src/gajim.py:1872
+#: ../src/gajim.py:1878
 msgid "Migrating Logs..."
 msgstr "正在移动日志..."
 
-#: ../src/gajim.py:1873
+#: ../src/gajim.py:1879
 msgid "Please wait while logs are being migrated..."
 msgstr "请等待日志被移动..."
 
@@ -3249,70 +3249,70 @@ msgstr "拒绝(_D)"
 msgid "_Discover Services"
 msgstr "发掘服务(_D)"
 
-#: ../src/gtkgui.glade.h:334
+#: ../src/gtkgui.glade.h:333
+msgid "_Discover Services..."
+msgstr "发掘服务(_D)..."
+
+#: ../src/gtkgui.glade.h:335
 msgid "_FAQ"
 msgstr "常见问题(_A)"
 
-#: ../src/gtkgui.glade.h:335
+#: ../src/gtkgui.glade.h:336
 #, fuzzy
 msgid "_File manager:"
 msgstr "文件管理器："
 
-#: ../src/gtkgui.glade.h:336
+#: ../src/gtkgui.glade.h:337
 msgid "_Filter:"
 msgstr "过滤器(_F):"
 
-#: ../src/gtkgui.glade.h:337
+#: ../src/gtkgui.glade.h:338
 msgid "_Finish"
 msgstr "完成(_F)"
 
-#: ../src/gtkgui.glade.h:338
+#: ../src/gtkgui.glade.h:339
 #, fuzzy
 msgid "_Font:"
 msgstr "字体："
 
-#: ../src/gtkgui.glade.h:339
+#: ../src/gtkgui.glade.h:340
 msgid "_Group Chat"
 msgstr "群聊(_G)"
 
-#: ../src/gtkgui.glade.h:340
+#: ../src/gtkgui.glade.h:341
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../src/gtkgui.glade.h:341
+#: ../src/gtkgui.glade.h:342
 msgid "_Highlight misspelled words"
 msgstr "拼写检查(_H)"
 
-#: ../src/gtkgui.glade.h:342
+#: ../src/gtkgui.glade.h:343
 msgid "_History"
 msgstr "历史(_H)"
 
-#: ../src/gtkgui.glade.h:343
+#: ../src/gtkgui.glade.h:344
 msgid "_Host:"
 msgstr "主机(_H)："
 
 #. Info/Query: all(?) jabber xml start with <iq Leaving it _IQ is not a bad idea unless you are sure your lang has this somehow else translated (NOTE: xml still will still say <iq in your language (of course))
-#: ../src/gtkgui.glade.h:345
+#: ../src/gtkgui.glade.h:346
 msgid "_IQ"
 msgstr "IQ(_I)"
 
-#: ../src/gtkgui.glade.h:346
+#: ../src/gtkgui.glade.h:347
 msgid "_Ignore events from contacts not in the roster"
 msgstr "忽略名单以外的联系人触发的事件(_I)"
 
-#: ../src/gtkgui.glade.h:347
+#: ../src/gtkgui.glade.h:348
 #, fuzzy
 msgid "_Incoming message:"
 msgstr "消息抵达："
 
-#: ../src/gtkgui.glade.h:348
+#: ../src/gtkgui.glade.h:349
 msgid "_Jabber ID:"
 msgstr "Jabber ID(_J)："
 
-#: ../src/gtkgui.glade.h:350
-msgid "_Join New Room..."
-msgstr "加入新房间(_J)..."
-
 #: ../src/gtkgui.glade.h:351
 msgid "_Kick"
 msgstr "踢除(_K)"
@@ -3713,7 +3713,7 @@ msgstr "服务器"
 msgid "You are already in room %s"
 msgstr "房间“%s”已在您的书签中。"
 
-#: ../src/roster_window.py:520 ../src/roster_window.py:2234
+#: ../src/roster_window.py:520 ../src/roster_window.py:2236
 msgid "You cannot join a room while you are invisible"
 msgstr "隐身时无法加入房间。"
 
@@ -3803,116 +3803,116 @@ msgstr "退出登录(_O)"
 msgid "_Change Status Message"
 msgstr "更改状态消息(_C)"
 
-#: ../src/roster_window.py:1589
+#: ../src/roster_window.py:1591
 msgid "Authorization has been sent"
 msgstr "授权发送成功"
 
-#: ../src/roster_window.py:1590
+#: ../src/roster_window.py:1592
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "现在“%s”将知道您的状态。"
 
-#: ../src/roster_window.py:1614
+#: ../src/roster_window.py:1616
 msgid "Subscription request has been sent"
 msgstr "认证请求已发出"
 
-#: ../src/roster_window.py:1615
+#: ../src/roster_window.py:1617
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr "如果“%s”接受此请求，您将知道他/她的状态。"
 
-#: ../src/roster_window.py:1626
+#: ../src/roster_window.py:1628
 msgid "Authorization has been removed"
 msgstr "授权被移除"
 
-#: ../src/roster_window.py:1627
+#: ../src/roster_window.py:1629
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "“%s” 将一直看到您的状态为离线。"
 
-#: ../src/roster_window.py:1796
+#: ../src/roster_window.py:1798
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "联系人“%s”将从您的名单中移除"
 
-#: ../src/roster_window.py:1800
+#: ../src/roster_window.py:1802
 #, fuzzy
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
 msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:1804
+#: ../src/roster_window.py:1806
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
 msgstr "移除此联系人的同时将默认移除认证，导致他/她将一直看到您为离线。"
 
-#: ../src/roster_window.py:1805
+#: ../src/roster_window.py:1807
 msgid "I want this contact to know my status after removal"
 msgstr "我想让此联系人在被移除之后仍然知道我的状态"
 
-#: ../src/roster_window.py:1873
+#: ../src/roster_window.py:1875
 msgid "Passphrase Required"
 msgstr "要求密文"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1876
 #, fuzzy, python-format
 msgid "Enter GPG key passphrase for account %s."
 msgstr "为账户 %s 输入 GPG 密文"
 
-#: ../src/roster_window.py:1879
+#: ../src/roster_window.py:1881
 msgid "Save passphrase"
 msgstr "保存密文"
 
-#: ../src/roster_window.py:1887
+#: ../src/roster_window.py:1889
 #, fuzzy
 msgid "Wrong Passphrase"
 msgstr "密文"
 
-#: ../src/roster_window.py:1888
+#: ../src/roster_window.py:1890
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr ""
 
-#: ../src/roster_window.py:1936 ../src/roster_window.py:1993
+#: ../src/roster_window.py:1938 ../src/roster_window.py:1995
 msgid "You are participating in one or more group chats"
 msgstr "您在一或多个群聊中"
 
-#: ../src/roster_window.py:1937 ../src/roster_window.py:1994
+#: ../src/roster_window.py:1939 ../src/roster_window.py:1996
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
 msgstr "隐身将从所有群聊中断开。确定隐身？"
 
-#: ../src/roster_window.py:1953
+#: ../src/roster_window.py:1955
 msgid "No account available"
 msgstr "没有有效账户"
 
-#: ../src/roster_window.py:1954
+#: ../src/roster_window.py:1956
 msgid "You must create an account before you can chat with other contacts."
 msgstr "您必须在与他人聊天前新建账户。"
 
-#: ../src/roster_window.py:2399 ../src/roster_window.py:2405
+#: ../src/roster_window.py:2401 ../src/roster_window.py:2407
 msgid "You have unread messages"
 msgstr "您有未读消息"
 
-#: ../src/roster_window.py:2400 ../src/roster_window.py:2406
+#: ../src/roster_window.py:2402 ../src/roster_window.py:2408
 msgid ""
 "Messages will only be available for reading them later if you have history "
 "enabled."
 msgstr "启用历史后才能再次重读消息"
 
-#: ../src/roster_window.py:3156
+#: ../src/roster_window.py:3158
 #, fuzzy, python-format
 msgid "Drop %s in group %s"
 msgstr "来自 %s ,房间 %s "
 
-#: ../src/roster_window.py:3163
+#: ../src/roster_window.py:3165
 #, fuzzy, python-format
 msgid "Make %s and %s metacontacts"
 msgstr "向联系人发送文件"
 
-#: ../src/roster_window.py:3329
+#: ../src/roster_window.py:3332
 msgid "Change Status Message..."
 msgstr "更改状态消息..."
 
@@ -4038,64 +4038,64 @@ msgstr ""
 "此服务无法返回详细信息。\n"
 "它可能是继承或损坏的"
 
-#. unknown format
-#: ../src/vcard.py:174
+#. keep identation
+#: ../src/vcard.py:186
 msgid "Could not load image"
 msgstr ""
 
-#: ../src/vcard.py:250
+#: ../src/vcard.py:262
 msgid "?Client:Unknown"
 msgstr "?Client: 未知"
 
-#: ../src/vcard.py:252
+#: ../src/vcard.py:264
 msgid "?OS:Unknown"
 msgstr "?OS: 未知"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:281
 #, fuzzy, python-format
 msgid "since %s"
 msgstr "浏览 %s"
 
-#: ../src/vcard.py:293
+#: ../src/vcard.py:305
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
 msgstr "此联系人对您的状态信息感兴趣，但您不关心他/她的状态"
 
-#: ../src/vcard.py:295
+#: ../src/vcard.py:307
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
 msgstr "您对此联系人的状态信息感兴趣，但他/她不关心您的状态"
 
-#: ../src/vcard.py:297
+#: ../src/vcard.py:309
 msgid "You and the contact are interested in each other's presence information"
 msgstr "您与此联系人同时对对方的状态信息感兴趣"
 
 #. None
-#: ../src/vcard.py:299
+#: ../src/vcard.py:311
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr "您与他/她互不关心对方的状态信息"
 
-#: ../src/vcard.py:308
+#: ../src/vcard.py:320
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "等待联系人回应您的认证请求"
 
-#: ../src/vcard.py:320 ../src/vcard.py:343
+#: ../src/vcard.py:332 ../src/vcard.py:355
 msgid " resource with priority "
 msgstr "带有优先级的资源"
 
-#: ../src/vcard.py:422
+#: ../src/vcard.py:434
 msgid "Without a connection you can not publish your contact information."
 msgstr "无法脱机发布个人信息。"
 
-#: ../src/vcard.py:451
+#: ../src/vcard.py:463
 msgid "Without a connection, you can not get your contact information."
 msgstr "无法脱机获取个人信息。"
 
-#: ../src/vcard.py:455
+#: ../src/vcard.py:467
 #, fuzzy
 msgid "Personal details"
 msgstr "个人信息"
@@ -4742,6 +4742,9 @@ msgstr ""
 msgid "cyan"
 msgstr "青色"
 
+#~ msgid "_Join New Room..."
+#~ msgstr "加入新房间(_J)..."
+
 #~ msgid "Usage: /%s, sets the groupchat window to compact mode."
 #~ msgstr "用法：/%s，设置群聊窗口为紧凑模式。"
 
@@ -4772,9 +4775,6 @@ msgstr "青色"
 #~ msgid "Update Message of the Day"
 #~ msgstr "更新每日消息"
 
-#~ msgid "_Discover Services..."
-#~ msgstr "发掘服务(_D)..."
-
 #~ msgid "_XML Console..."
 #~ msgstr "XML 控制(_X)..."